Drawing added in
Quick commit before working on angular
Seperation of database file in node.js now works.
No real update here
Update to nodejs seperation
Merge branch 'master' of github.com:benk691/hackathon into tmp
Merge branch 'nodejs' of github.com:benk691/hackathon into tmp
Fully merged changes
app.js
merge conflicts