first commit
Merge branch 'master' of https://github.com/SilvioAmaral/MeanJoust

Conflicts:
	README.md