Fixed a bug
Fixed a bug
Fixed a bug in index.js
Merge branch 'master' of heroku.com:afternoon-eyrie-7322

Conflicts:
	index.js
Fixing merge issues
Added some database scripts and a README on how to use them