rails init
Merge branch 'testing'