merge
Merge branch 'master' of https://github.com/everettm/TamaGappa

Conflicts:

TamagAppa.xcodeproj/project.xcworkspace/xcuserdata/labuser.xcuserdatad/U
serInterfaceState.xcuserstate