Modified conversation controler #9
Resolve conflicts + Conversation Controller and Conversation Views modified #9
Added new_conversation/:id #11
Add login facebook #18
Merge pull request #20 from bitca-andrei/18-Zein-Cristian

Add login facebook #18
Added listing for all your conversations/Create a conversation on new_conversation/:id #9
Added listing of all messages in a conversation (\conversations\:id) #9
Merge branch 'master' into 9-bitca-andrei

Conflicts:
	Online Tests/app/assets/stylesheets/custom.css.scss
	Online Tests/config/routes.rb
	Online Tests/config/routes.rb~
	Online Tests/db/schema.rb
Merge branch 'master' into 9-bitca-andrei

Conflicts:
	Online Tests/db/schema.rb
Merge pull request #24 from bitca-andrei/9-bitca-andrei

9-bitca-andrei : Private message system finished
Merge succesfull
Added Style for User Login/User Signup/Forgot your password/My profile #19
Fully modified the navigation bar #19
Added profile page for every user #19
Merge pull request #26 from bitca-andrei/19-bitca-andrei

19-bitca-andrei : Added multiple features
Issue #22 completed
Merge pull request #27 from bitca-andrei/22-bitca-andrei

Issue #22 completed
Merge branch 'master' into 10-Pavileanu-Mircea

Conflicts:
	Online Tests/app/assets/stylesheets/custom.css.scss
	Online Tests/config/routes.rb
	Online Tests/config/routes.rb~
	Online Tests/db/schema.rb
Conflicts resolved