Merge branch 'zach_branch'

Conflicts:
	ucr_hbs/app/controllers/database_controller.rb
Removed git meta-text
Merge branch 'master' of https://github.com/zakattax/180Project into caleb_branch

Conflicts:
	ucr_hbs/app/controllers/database_controller.rb