tst
Merge branch 'master' of github.com:Habrok/a

Conflicts:
	db/schema.rb
bundle gems