started adding reset password functionality
Merge branch 'master' of github.com:globalavocado/bookmarks-manager

Conflicts:
	app/server.rb