Button types
Merge branch 'master' of https://github.com/4drenalin3/festival-totaal

Conflicts:
	index.html