initial commit
initial merge of remote and local repositories

Merge branch 'master' of https://github.com/mariohsieh/project_rails