Initialize repository
	modified:   Gemfile
Merge branch 'master' of https://github.com/ApepeDevil/first_app

Conflicts:
	Gemfile
	Gemfile.lock
	Rakefile
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.erb
	bin/rake
	config/application.rb
	config/boot.rb
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/mime_types.rb
	config/initializers/session_store.rb
	config/routes.rb
	public/404.html
	public/422.html
	public/500.html
	public/robots.txt
	test/test_helper.rb

	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   README.rdoc
	modified:   Rakefile
	modified:   app/assets/stylesheets/application.css
    modified:   app/views/layouts/application.html.erb
	modified:   bin/rails
	modified:   bin/rake
	modified:   config/application.rb
	modified:   config/boot.rb
	modified:   config/database.yml
	modified:   config/environment.rb
	modified:   config/environments/development.rb
	modified:   config/environments/production.rb
    modified:   config/environments/test.rb
	modified:   config/initializers/mime_types.rb
	new file:   config/initializers/secret_token.rb
	modified:   config/initializers/session_store.rb
	modified:   config/routes.rb
	modified:   public/404.html
	modified:   public/422.html
	modified:   public/500.html
	new file:   public/assets/application-a029bd03bea21da7d02c0e9d272edc3a.css
	new file:   public/assets/application-a029bd03bea21da7d02c0e9d272edc3a.css.gz
	new file:   public/assets/application-b0df37247e6418132e519b144cdaf3da.js
	new file:   public/assets/application-b0df37247e6418132e519b144cdaf3da.js.gz
	new file:   public/assets/manifest-d3b4171058cbfdea4f283ca2af6acc9c.json
	modified:   public/robots.txt
	modified:   test/test_helper.rb