picture
Merge branch 'master' of heroku.com:enchord
Merge branch 'master' of github.com:jemah/enchord

Conflicts:
	views/sidepartial_userinfo.ejs
Merge