JMUJams
Merge branch 'master' of https://github.com/harbinha/JMUJams

Conflicts:
	README.md