commit 10/25/2014
Merge branch 'master' of https://github.com/chasemg/babybling