updated doc
Merge branch 'master' of github.com:bennoislost/serious-setup

Conflicts:
	README.md