Test TODO ingevoegt
TODO's weggewerkt
ygiEWGFKLsdgyAFILK
TODO locatie
Commit testing
Merge branch 'Dev-B' of https://github.com/Eyedicious/Minor-SM into Dev-B
TAGLIST
Merge branch 'Dev-B' of https://github.com/Eyedicious/Minor-SM into Dev-B
Splashscreen en TODOs in main
Merge branch 'Dev-B' of https://github.com/Eyedicious/Minor-SM into Dev-B
Test en project uptodate maken
DONE
Merge pull request #1 from Eyedicious/master

Merging Master to prototye
Merge branch 'Prototype' into Dev-B

Conflicts (RESOLVED):
	Shiptelligence/res/layout/splashscreen.xml
	Shiptelligence/src/minor/maps/MainActivity.java
	Shiptelligence/src/minor/maps/SplashScreen.java
Merge pull request #3 from Eyedicious/Dev-B

Dev b