add entypo
Merge branch 'entypo'

Conflicts:
	app/assets/stylesheets/users.css.scss