Init
ticket 618 layout
Merge branch '618_layout' of gitlab.loc:ror_team into dev
add gem minitest-rails
delete minitest-rails and add gem minitest
delete gem minitest
create project factory
Fix conflict
fix layout
tmp commit
switch branch dev
Created branch dev
Merge branch 'master' into dev
remove idea
Merge branch 'dev' into 629_life_chat

Conflicts:
	app/assets/stylesheets/application.scss
	app/views/layouts/application.html.haml