Quick update
Merge branch 'master' of https://github.com/Croxed/Story

Conflicts:
	README.md