Merge pull request #1 from EricKutschera/eric

Initialized a rails project
should be able to run rails s
settled merge conflicts