Sync
Merge branch 'BTEST' of https://github.com/kennahasson/COGS120 into BTEST

Conflicts:
	views/home.handlebars
Quick