Merge pull request #1 from steve8/master

Commit of rails codebase
Merge branch 'master' of https://github.com/meesterdude/softandfluffynotes