local changes to go up
Merge pull request #1 from thomashug/master

local changes to go up as they are damn good
Update README.md
Merge remote-tracking branch 'upstream/master'