merge conflicts
Merge branch 'master' of https://github.com/nicholalexander/project2
conflict resolution
change assets precompile