You can show an image instead of a disk
Merge branch 'master' of https://github.com/jmdrouin/incredible-art

Conflicts:
	coffee/frenzy.coffee