Merge branch 'master' of github.com:buren/test into max

Merge.
readme
asd
ad
testevabranch
Merge pull request #22 from buren/testevabranch

Testevabranch
Update README.md
trash
Fixed merge conflicts
Create test.md
Update test.md
Update README.md
Update README.md
ja
Fixed merge conflicts
wtf
what
a
a
gitstoryrc