Fixed Typos
Merge branch 'master' of github.com:mjsalerno/Unhackathon

Conflicts:
	db.js