lots of stuff
Merge branch 'master' of github.com:Darkz/Star

Conflicts:
	README.md