merge conflict things
Merge branch 'master' of github.com:alexhughesking/MathSnap
clear progress, start layout changes to wp