Merge branch 'master' of https://github.com/camazorro/MathEditor

Conflicts:
	.gitignore
	README.md
Merge remote-tracking branch 'remotes/MathEditor/master'

Conflicts:
	README.md