action mailer functional after placing reservation, reservation mailer message, ActiveAdmin admin_user added to user model as references
turned off action mailer emails
fixed detached heads again
seamless devise and active admin login integration
Merge pull request #42 from jackson-sandland/style_user_login

seamless devise and active admin login integration
added end in the superadmin migration, params permit in devise
added phone_number and name to devise regristration
added name and phone number to devise, also validates
Merge pull request #43 from darrenwong916/javascript_edit

Adding devise name and phone number in sign_up and edit
Heroku seed file set up
fixed detach head
Merge pull request #45 from darrenwong916/fnc314-seed_file_final

Fixed detached head in super_admin