maps
Merge branch 'master' of
https://github.com/inickt/Adv.-Computer-Science-Q1-Project.git

Conflicts:
	resources/images/greep.png
added comments