Moved some files around
Merge branch 'master' of https://github.com/cnnrdltn/CS164-Catalog

Conflicts:
	app/database/.DS_Store