fixing merge conflicts in app.less
Merge pull request #142 from taylorharwin/fix-merge

Fix merge