added foo
my first rails app
update to rails app
Merge branch 'master' into rails
update