removed unexpected end at line number 81 from file
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is ahead of 'origin/master' by 3 commits.
#   (use "git push" to publish your local commits)
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   app/controllers/location_hours_controller.rb
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	app/controllers/appointments_controller.rb~
#	app/controllers/location_hours_controller.rb~
#	config/application.rb~
#	config/initializers/devise.rb~
Merge branch 'master' of https://github.com/amandamcwhorter/team_aura into dj/payment
Merge pull request #43 from amandamcwhorter/dj/payment

Dj/payment