Merge branch 'master' of https://github.com/ProfessorKaos64/RetroRig into beta

merge of master
Merge branch 'master' of https://github.com/ProfessorKaos64/RetroRig into beta

merge readme from master
Readme for beta branch
Merge branch 'master' of https://github.com/ProfessorKaos64/RetroRig into beta

merge files
Merge branch 'master' of https://github.com/ProfessorKaos64/RetroRig into beta

Conflicts:
	README.md

merging for beta
Merge branch 'master' of https://github.com/ProfessorKaos64/RetroRig into beta

Conflicts:
	README.md

Merging master README.md file
Merge branch 'master' of https://github.com/ProfessorKaos64/RetroRig

merge