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

Merge.
updated readme
Merge pull request #17 from buren/story32

updated readme
readme
Update README.md
asd
ad
Updated...
Update README.md
readme
conflict
Update README.md
done
fi
Update README.md
readm
mergeconf
gitstoryupdate
Update README.md
Update README.md