Intial commit
Improve the README file
Merge branch 'master' of github.com:ghettoeinstein/first_app

Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/secret_token.rb
	script/rails