application tour
Showing randomized proposals in a gallery window
Moved js requir code to new line
Rectified file name
Moved carousel js file to public
Made previous button functional
Decreased width of proposal div cards
Corrected the loop
Show carousel conditionally

Show proposals having collecting_started as 1 and collecting_ended as 0
Modified query to make compatible with pg
Showing start date and end date for proposals
increased left margin forproposal cards in carousel
Changed navigation buttons for carousel

Conflicts:

	app/assets/stylesheets/pages.css.scss
	app/views/pages/_drafts.html.haml

Conflicts:

	app/assets/stylesheets/pages.css.scss
	app/views/pages/_drafts.html.haml
Re-positioned previous button for carousel

Conflicts:

	app/assets/stylesheets/pages.css.scss
Fixed branching issues

Conflicts:

	app/views/pages/_drafts.html.haml
Modified raphel bar text
Added tour on idea show page
UI Formatting
Merge branch 'proposal_carousel'

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/pages.css.scss
	app/controllers/pages_controller.rb
	app/views/pages/_drafts.html.haml
Merge branch 'initial_tour'

Conflicts:
	app/assets/stylesheets/pages.css.scss
	app/views/ideas/show.html.haml
	app/views/pages/_headline.html.haml
	app/views/pages/home.html.haml