y u no linebreak?!
typo
Merge branch 'master' of github.com:davidsantoso/markety into up
Merge branch 'up' into up-break

Conflicts:
	README.md
Merge pull request #20 from gbirchmeier/up-break

y u no linebreak?