bug_complete
almost finished
Merge branch 'to_rails4' of https://github.com/ken-wong/thinkprojects into to_rails4