rama dev
Merge pull request #1 from Solo-Ruby-and-Rails/dev

rama dev