updates
commit
Merge branch 'master' into coverphoto

Conflicts:
	app/views/users/show.jade
cover photo working