Merge branch 'dev' into josh

Conflicts:
	rottenapi.py
Merge branch 'dev' into josh
Center search bar in home
Merge branch 'josh'

Conflicts:
	templates/home.html
Merge branch 'master' of github.com:stuycs-softdev/proj2-pd7-08-theRoom