Transition to Rails
Merge pull request #1 from criskelly/master

Transition to Rails
conflicts