new stuff
Merge branch 'maps' of https://github.com/mayerseidman/BetterReads into maps

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/index.html.erb
Merge branch 'maps' of https://github.com/mayerseidman/BetterReads into maps
j
deleted