Testar att reparera git
Merge branch 'master' of https://github.com/carlhaman/malmovideo

Conflicts:
	malmo/default.aspx.cs