Modified styles
Merge branch 'master' of github.com:zifeishan/emotif

Conflicts:
	emotif/app/views/partials/content.jade
	emotif/app/views/partials/select.jade
	emotif/app/views/partials/settings.jade
	emotif/app/views/partials/trend.jade
	emotif/public/css/main.css