edited new alert page
Merge branch 'master' of github.com:kaplanoah/camcam
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
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'
final fallback commit before presentation - added url to text message
added bootstrap cdn
pre-presentation commit