Old changes
Merge branch 'master' of github.com:bmaxwell921/PixHellRedux