auda
Merge branch 'master' of github.com:asperheim/mesangitkurs

* 'master' of github.com:asperheim/mesangitkurs:
  Moved fight to subfolder Super
  konfllikt?

Conflicts:
	10.txt
	Super/1.txt
	Super/2.txt