colocando bootstrap e layout
Merge branch 'master' of https://github.com/thedeps/dev

Conflicts:
	app/views/users/_form.html.erb
	app/views/users/index.html.erb