Fixed #6
Merge branch 'master' of https://github.com/Masovski/TeamTABALUGA2

Conflicts:
	index.html
	nein-gag.html