database
Merge branch 'master' of https://github.com/mookie1097/ProjectAlbert

Conflicts:
	db/development.sqlite3
database