Merged

.gitignore

@@ -18,7 +18,7 @@ ExportedObj/
 *.pidb
 *.booproj
 *.svd
-
+.idea/
 
 # Unity3D generated meta files
 *.pidb.meta
@@ -32,3 +32,6 @@ sysinfo.txt
 
 Quantifly.x86_64
 Quantifly_Data
+
+# MacOS files
+.DS_Store

.idea/.idea.igem-quantifly/.idea/.name

-igem-quantifly
\ No newline at end of file

.idea/.idea.igem-quantifly/.idea/modules.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/riderModule.iml" filepath="$PROJECT_DIR$/riderModule.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file

.idea/.idea.igem-quantifly/.idea/vcs.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file

.idea/.idea.igem-quantifly/riderModule.iml

-<?xml version="1.0" encoding="UTF-8"?>
-<module type="RIDER_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$/../..">
-      <sourceFolder url="file://$MODULE_DIR$/../.." isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/../../Temp/bin" />
-      <excludeFolder url="file://$MODULE_DIR$/../../obj" />
-    </content>
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file