Added Gui + end state
Merge branch 'develop' of https://github.com/mew2057/SuperAwesomePeopleDoingAwesomeThings into develop