added turbolinks for rails 4
Merge branch 'master' of github.com:anilmaurya/bidder into rails_4

Conflicts:
	Gemfile
Merge branch 'master' of github.com:anilmaurya/bidder into rails_4

Conflicts:
	Gemfile
session controller issue fixed
Merge branch 'master' of github.com:anilmaurya/bidder into rails_4

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
Merge pull request #26 from adityashedge/master

modified about us page
Merge branch 'master' of github.com:anilmaurya/bidder

Conflicts:
	Gemfile.lock
removing turbolinks
set serve_static_assets to true in production mode
adding rails_12factor gem for heroku asset compile
rake assets compile true for production