final version 1.0 of Masterly Mate
Merge branch 'master' of https://github.com/JeyB88/WBTS

Conflicts:
	MasterlyMate/public/upload/index.html