More front end stuff
Merge branch 'master' of https://github.com/MrExpendable/PixelJunkie