Alignment
Merge branch 'master' of https://github.com/kennahasson/COGS120

Conflicts:
	views/home.handlebars