Merge branch 'kevin_branch'
Merge branch 'master' of https://github.com/gregarious/lilypad-pace