Change intro image
Merge branch 'master' of git@github.com:sneakers3/listener

Conflicts:
	page/history.html