First commit. New Rails 4 App
merged conflicts