Initial commit
Merge branch 'master' of github.com:paradasia/rails-4-playground

Conflicts:
	rails_3_to_4.md