Merge branch 'master' of https://github.com/johntk/JAKD

Conflicts:
	src/gui/HomeScreen.java
Commit
Merge branch 'master' of https://github.com/johntk/JAKD.git