Complete merge of #132 with compiled app.css
Merge pull request #153 from kylef-lab41/master

Complete merge of #132 with compiled app.css