added Edit Users and Pending Neighborhoods to nav bar. LINKS NOT WORKING YET
users admin page created and it displays members emails
Updated admin actions to delete and promote users admin
Edit users page for admins is functional
Updated comments for team use in test
Hushed the hound
Refinements
Finished addressing feedback items
Updated tests
Added line
Build was broken, but fixed now
preparing for merge
Erased extra spaces
Merge pull request #34 from LaunchAcademy/admin

Admin
Delete .hound.yml
Merge branch 'master' of github.com:LaunchAcademy/neighborhoods into votes

Conflicts:
	app/models/user.rb