Created Adam branch and added plane class
#4 Implemented the Plane class with move method, no tests
#4 corrected and added plane class to entities.py
git made me do it
i have no idea what i am doing
tidying up randgen
tidying up randgen
tidying up randgen
terrain gen now outputs an image
finalised terrain gen
Fixed Create waypoints, and entry and exit points

Conflicts:
	apollo/map.py
Merge branch 'master' into randgen
Remove unused diamond square file
Merge terraingen into utils
AutoPEP8 utils
Clean up utils
Fix .gitignore