admin
conflicts
Merge branch 'master' of github.com:Litocruz/static

Conflicts:
	app/views/users/edit.html.erb