added user admin page and bootstrap
Merge branch 'master' of github.com:marklocklear/rails4authfromscratch

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/index.html.erb