first commit
Merge branch 'master' of https://github.com/Krzychuuu/Ruby

Conflicts:
	config/initializers/secret_token.rb
	config/routes.rb
	db/schema.rb