includes devise for admin
test branch
first commit
branch merging
added pg and taps for heroku deploymet
restoring master
Merge branch 'devise_admin'