12/4/14

asd
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
	routes/database.js
Merge branch 'master' of https://github.com/mframp/Animation-Project-Manager