bla
Merge branch 'master' of https://github.com/Landin/Budokan

Conflicts:
	index.html
	src/app.js