update
Merge branch 'master' of https://github.com/birthmark/oalTouch

Conflicts:
	.gitignore