Issue #167, Base for landing page
Fix conflicts with master
Fix conflicts
Merge branch 'C1_mennaamr_#91_Facebook_login' of github.com:DevYah/coolsoft-13 into C1_mennaamr_#91_Facebook_login
Fix application.js
Issue #218, Add winner to migration
Issue #218, Add model of competition
Merge branch with Twitter Login
Merge branch 'master' into C1_Sameh_Landing_page

Conflicts:
	Idearator/app/views/home/index.html.erb
Merge branch 'master' into C3_marwa-mehanna_#218_competition_crud

Conflicts:
	Idearator/app/models/competition.rb
Issue #217, creates a new stream controller, views, javascripts, without sketch implications
Issue #218, Add competition controller

finished submit/edit/show
Issue #218, Add attr accessible for competition
ISsue #218, Add routes for competitions
Issue #218, Add show view for competitions
Issue #218,Add edit view
Issue #218, Add form of submiting a new competition
Issue #218,Add new view
Issue #218, Add index view
Issue #218, Add auto complete to tags of competition