Moved assets around, added code.
Merge branch 'master' of https://github.com/HotTrouble/macaron