Update
Merge branch 'master' of https://github.com/InfotecMX/SemEngine

Conflicts:
	.gitignore