Merge branch 'dev' of...

Merge branch 'dev' of https://gitlab.stud.idi.ntnu.no/tdt4240-progark/tdt4240-progark-project into dev

.gitignore

@@ -49,6 +49,10 @@ captures/
 .idea/modules.xml
 # Comment next line if keeping position of elements in Navigation Editor is relevant for you
 .idea/navEditor.xml
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+CheckersServer/.idea/caches
+CheckersClient/.idea/caches
 
 # Keystore files
 # Uncomment the following lines if you do not want to check your keystore files in.