first commit
Merge branch 'master' of https://github.com/nemui/puramu

Conflicts:
	.gitignore