Zifei's temp modif
Merge branch 'master' of github.com:zifeishan/emotif

Conflicts:
	emotif/app/views/index.jade
Added photo logic, etc