merge conflict resolved
Merge branch 'master' of https://github.com/ChemicalWonders/CodeDay2014