testar igen
Merge branch 'master' of https://github.com/muhsli/U4A.git

Conflicts:
	U4A/assets/www/index.html