Merge branch 'master' of https://github.com/ted80/ProjectMyth

Conflicts:
	ProjectMyth/bin/tex/gui/gui.png