Merge branch 'master' of https://github.com/jmdrouin/incredible-art

Conflicts:
	coffee/star.coffee