working version
Merge branch 'master' of https://github.com/ryoia/Paint

Conflicts:
	.gitignore