more pic
Merge branch 'master' of https://github.com/rbao/csc318g5

Conflicts:
	app/assets/images/hokey_moment.JPG
	app/assets/images/moments/hockey.JPG
	app/assets/images/moments/hokey_moment.JPG