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

Merge.
readme
asd
ad
Update README.md
Update README.md
ja
Fixed merge conflicts
wtf
what
a
a
gitstoryrc
asd
gsstoryrc
mrg conf
Merge branch 'wahtb' of github.com:buren/test into user_login
u
hm