upgraded from rails 3.1 to 3.2.17
upgraded from rails 3.2.17 to rails 4.0.2
edit .gitignore
BUGFIX
Merge pull request #2 from jeffaburt/upgrade-to-rails-4

Upgrade to rails 4