transition broken
Merge branch 'master' of https://github.com/mixbe/1jaarmix

Conflicts:
	index.html
Merge branch 'master' of https://github.com/mixbe/1jaarmix