Differeing markers implemnted
Merge branch 'master' of https://github.com/addtheletters/2013-PhillyThon