I messed up the first time but I'm still a Pokemon master. Mostly.
Merge branch 'master' of https://github.com/michaelpeng/proj1