added dotenv gem and file, and pry gem
bundled gems
add gem and method to dashboard controller
new method in controller
merge prep
attempt to make heroku time config to local time
alert advanced options form works
add initializer and gem
new controller and assests
camera controller ready for nexmo
changed dotenv gem to dotenv-rails
Merge branch 'master' of https://github.com/JasonLev/camcam into JasonLev-master

Conflicts:
	Gemfile.lock
	app/controllers/camera_controller.rb
Merge branch 'JasonLev-master'
alert now belongs to user
set and see your options
final touches
merged changes
Merge branch 'paninapress-alertoptions'