Merge pull request #1 from ted27/master

Merge in the rails app thing
Merge branch 'master' of https://github.com/Apothys/project-october

* 'master' of https://github.com/Apothys/project-october: