Update database.yml.example
Create model
Create models2
add relations
add columns Firstname and Lastname to User sign_up
Add firstname and lastname to user sign_up
Merge branch 'correct_sign_up' of github.com:SBS-team/chaaat into correct_sign_up
sign_in bootstrap
Add facebook authorization
create room
add gem rails-erd
add_push
add model rooms_users
add gem annotate
add github
Merge branch 'room' of github.com:SBS-team/chaaat into room
add github authorization
Merge branch 'room' into add_pusher

Conflicts:
	Gemfile
	config/routes.rb
Merge branch 'add_pusher' of github.com:SBS-team/chaaat into add_pusher
Merge branch 'add_pusher' of github.com:SBS-team/chaaat into room

Conflicts:
	Gemfile
	config/routes.rb
refactor views and fix html tag