Add devise
Layout
Layout
Add type to User
Add users controller
Merge branch 'add_users' into design

Conflicts:
	app/views/layouts/application.html.slim
Add design
Merge branch 'design'