added url to place
Merge pull request #10 from jared-schmidt/urlMenu

added url to place
Fixed admin users
better log in UI
Merge pull request #11 from jared-schmidt/AdminFix

Fixed Admin Users
pulled down master
ignore
remove file
Merge pull request #13 from jared-schmidt/betterLogIn

Better log in
fixed merge conflict
Merge pull request #15 from jared-schmidt/mergeFix

fixed merge conflict
Merge branch 'master' into PopulatePlaces

Conflicts:
	client/views/place.html
	server/server.js