initial commit
Merge branch 'master' of https://github.com/444c43/joom

* 'master' of https://github.com/444c43/joom:
  Initial commit

Conflicts:
	.gitignore