submitting my stuff, trying to update
Merge branch 'master' of https://github.com/Whirligig231/boilermake2014

Conflicts:
	Levels/level1.txt
	src/GameComponent.java
Merge branch 'master' of https://github.com/Whirligig231/boilermake2014
loading externals, trying to update to doolan's fix