Add Rails 4 App to Quickstart
Fix repo conflicts and commit a fresh rails 4 project