changes to bootstrap
Merge branch 'master' of https://github.com/ryanyu399/cse170project

Conflicts:
	views/index.handlebars
merged files