Added keywords
Merge branch 'master' of github.com:hiddentao/melkor

Conflicts:
	README.md