Merge branch 'master' of github.com:ldcsaa/JessMA

Conflicts:
	LICENSE
Merge branch 'master' of github.com:ldcsaa/JessMA

Conflicts:
	LICENSE