newly created passwords are now encrypted
merged conflicts
Update and rename README.rdoc to README.md
merged password check and truncate error fix from refactor
Merge branch 'refactor'
hack around bcrypt for now
added original migrations from sinatra version
removed binding.pry in UserController#delete_bookmark
fixed password check for creating new password