daily view work
Merge branch 'master' of https://github.com/cosc480somac/SOMACapp

Conflicts:
	db/development.sqlite3
	log/development.log