Initial commit
Merge branch 'master' of https://github.com/thair116/first_app

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	config/environment.rb
	config/initializers/secret_token.rb
	config/routes.rb
Third commit