Ok well pretty much had to redo an hour or so worth of work :/
Merge branch 'master' of https://github.com/RealStandardStudios/RpgApp.git