added rails folder for basic defaults
Merge remote-tracking branch 'origin/master'