Merge branch 'tommy'
risikoplan
Merge branch 'tommy'
Merge branch 'tommy'
Merge branch 'tommy'
idk
Merge branch 'master' of https://github.com/tommynordli/PJ2100_Gruppe34
Compatible between browsers
Merge branch 'master' into tommy

Conflicts:
	prototype/PJ2100/index.html