Test views
Merge branch 'master' of https://github.com/sierrakn/247finalproject

Conflicts:
	views/index.handlebars