Initial commit and change to .env, .gitignore, and Gemfile
Merge branch 'master' of github.com:nivram80/the-nag

Conflicts:
	the-nag/Gemfile
add env and gitignore files
configure unicorn and add Procfile
Added Procfile and heroku stuff
Gem install foreman
Changed logging behaviour in development.rb
configured logger database
Restructured files: Moved the-nag/the-nag/* to the-nag/*
Clean out removed files from git tracking
Merge branch 'master' of github.com:nivram80/the-nag

Conflicts:
	Gemfile.lock
	config/environments/development.rb
	the-nag/.env
One residual file cleaned up
add bcrypt gem
boo heroku
gemlock file change
add dashboard controller and view folder
route page image
Merge branch 'master' of https://github.com/nivram80/the-nag
complete basic dashboard controller, route, and view
Merge branch 'master' of https://github.com/nivram80/the-nag into dashboard_add

Conflicts:
	config/routes.rb