stop:
Merge branch 'master' of https://github.com/projectus/projecto
Merge branch 'master' of https://github.com/projectus/projecto
test
Merge branch 'master' of https://github.com/projectus/projecto

Conflicts:
	projecto/db/schema.rb
commit
ui 1