Temporary commit. Stashing doesn't work somehow.
Merge branch 'master' of
https://github.com/CraigSnowden/team-super-awesome.git

Conflicts:
	General Destruction/src/teamsuperawesome/GeneralDestruction.java