initial
Merge branch 'master' of https://github.com/pekokun/redminer

Conflicts:
	.gitignore