Turned off force ssl
Merge branch 'master' of github.com:patteh/sample_app

Conflicts:
	config/environments/production.rb