initialize
Merge branch 'master' of github.com:Shahdee/dragon

Conflicts:
	.gitignore
before merge