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

Conflicts:
	the-nag/Gemfile
Added Procfile and heroku stuff
Gem install foreman
Changed logging behaviour in development.rb
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