Resolve conflict from old commit
Move subtitle style to global sheet
Merge branch 'master' of github.com:GlimmerLabs/MathOverImages