Early draft
Merge branch 'master' of github.com:cbuntain/osdcChallenge2014