master readme
Merge branch 'readme-expand' of https://github.com/aevv/miniature-octo-happiness into readme-expand

Conflicts:
	README.md