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

Conflicts:

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

TamagAppa.xcodeproj/xcuserdata/labuser.xcuserdatad/xcdebugger/Breakpoint
s_v2.xcbkptlist