added variable for mapatom size
Merge branch 'master' of https://github.com/amonsch/GalacticTrollCastle

Conflicts:
	main.cpp