add gem and method to dashboard controller
Merge pull request #1 from paninapress/devise

Devise
new method in controller
Merge branch 'master' of github.com:kaplanoah/camcam
merge prep
added camera controller
created camera model that belongs_to user
added route and method for getting ajax call from Node.js app
Merge pull request #2 from paninapress/cameraModel

created camera model
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