updated tumblr header
Update README.md
added media type entry support
Merge branch 'master' into workPageMinimal

Conflicts:
	app/index.html
	app/styles/main.scss