Changes made by Steffen Henriksen (steffenhenriksen1@live.dk).
Merge branch 'master' of https://github.com/djaevlen/DickoApp.git

Conflicts:
	DickoApp/index.html
Changes made by Steffen Henriksen (steffenhenriksen1@live.dk).