intial commit with scaffold
made models and migration
Added queries
Updated Json builder for the models.
Gitignore database.yml file
Merge remote-tracking branch 'remotes/origin/ui'

Conflicts:
	app/controllers/application_controller.rb
Merged and cleaned up.
Added 12factor gem for heroku.
Heroku fix #2...
Added ruby version.
Fixed ruby version.
Changed Angular template routes.
Fixed syntax error.