Merge branch 'master' of https://github.com/pokeairguy/CW3_GUI

Conflicts:
	src/dod/GUI.java
Revert "Merge branch 'master' of https://github.com/pokeairguy/CW3_GUI"

This reverts commit cb4f2e802012702a137a432b934aeef47d76d063.
Merge branch 'master' of https://github.com/pokeairguy/CW3_GUI