Did totally awesome change
Merge remote-tracking branch 'pete/master'

Conflicts:
	README.md
Merge pull request #1 from Tarrasch/master

Merge my awesome changes!!
sounds good