started rails app
Merge branch 'katesbranch'