test
test controller
Update README.md
Delete .gitignore
Merge branch 'develop' of github.com:SBS-team/chaaat into test

Conflicts:
	app/controllers/friendships_controller.rb
test
Merge branch 'test' into develop

Conflicts:
	README.md
	app/assets/javascripts/application.js
	app/assets/javascripts/messages.js
	app/assets/javascripts/rooms.js
	app/assets/javascripts/user.js
	app/assets/stylesheets/lobby.css
	app/controllers/application_controller.rb
	app/controllers/rooms_controller.rb
	app/helpers/application_helper.rb
	app/helpers/rooms_helper.rb
	app/views/layouts/_rooms_list.html.haml