Merge github.com:mag1971/michael_app

Conflicts:
	Gemfile
	Gemfile.lock
	README.md
	config/initializers/secret_token.rb
Merge github.com:mag1971/michael_app