pooo
Merge branch 'master' into pooooo

Conflicts:
	gyropad/gyropad.xcodeproj/project.pbxproj
Merge pull request #23 from repokoa/pooooo

pooo