Commit som 'måske' virker
Merge remote-tracking branch 'origin/master'

Conflicts:
	FDF/FDF.v12.suo
	FDF/FDF/bin/FDF.dll
	FDF/FDF/bin/FDF.pdb
	FDF/FDF/obj/Debug/FDF.dll
	FDF/FDF/obj/Debug/FDF.pdb
Merge branch 'master' of https://github.com/PC-Rangers/FDFSITE

Conflicts:
	.gitignore
	FDF/FDF.userprefs
Delete