init repo
Merge branch 'master' of https://github.com/ericmanlol/rails4_testapp