more confilic resolution :(
Merge branch 'master' of github.com:alexhughesking/MathSnap