asset pipeline stuff
Merge branch 'master' of github.com:Willfire19/Usephoria