make blank user index
add name to location table
remove unused tests
add name to location form
clean up form
remove formatting of forms
Merge branch 'master' of github.com:ismith-adam/myprimeplace

Conflicts:
	app/controllers/users_controller.rb
	app/views/locations/_form.html.erb
	app/views/users/_form.html.erb
resolving merge conflicts
Merge branch 'master' of github.com:ismith-adam/myprimeplace
Merge branch 'master' of github.com:ismith-adam/myprimeplace

Conflicts:
	app/controllers/users_controller.rb
added location show
Merge branch 'master' of github.com:ismith-adam/myprimeplace

Conflicts:
	app/views/locations/show.html.erb
footer border