gemfile.lock update
Merge branch 'master' of https://github.com/ktk10191/project3-happy-hour
Merge branch 'master' of https://github.com/ktk10191/project3-happy-hour
Merge branch 'master' into Ryan
Merge branch 'master' into Ryan
Merge branch 'master' into Ryan
Merge branch 'master' into Ryan
Got google map showing up at least
Merge pull request #8 from ktk10191/Ryan

Ryan updated application.html.erb to get map showing up at least
Added some files to get a mailer working. Will test later on