Merge branch 'ButtonMapping'

Conflicts:
Code Read-Me.docx