add bg
Merge branch 'master' of https://github.com/jcheng31/CS3213-Homework-2

Conflicts:
	app/assets/stylesheets/style.css
Merge branch 'master' of https://github.com/jcheng31/CS3213-Homework-2