Demo
First Commit
Merge pull request #7 from Zappeion/ken

Ken, I'm merging
Changed routes for debug
Merge branch 'master' of github.com:Zappeion/athens

Conflicts:
	server.js
Merge branch 'master' into pv

Conflicts:
	app/routes.js