Guitar now almost in presentation module
Fixed conflicts
Merge branch 'master' of github.com:Grulfen/air_guitar
Bass and Guitar now works