Upgrading to Rails 4.0.0
Merge branch 'master' of github.com:RBSavvy/gistr

Conflicts:
	Gemfile.lock