upgrade to rails 4.0.3
Merge branch 'master' of github.com:jameswritescode/blog

Conflicts:
	Gemfile