Merge branch 'master' of github.com:darkstario/darkstar

Conflicts:
	README.md