fixing merge conflicts
fixes merge conflict in graph.tpl.html
makes sure is less is updated
updates app.css
Merge pull request #57 from taylorharwin/cleanup-code-latenight

Cleanup code latenight