dqwd

dqwdqw
dwqdqw

dqwdqwd
dwwd

wdwdw
wololo

wololo
Merge remote-tracking branch 'origin/master' into Magnus

Conflicts:
	Moonminer/Moonminer.sdf
	Moonminer/Moonminer.v11.suo
sfml makeover

dynamic sfml linkage
Merge branch 'master' of https://github.com/Peter-Nil/MoonMiner

Conflicts:
	Moonminer/Debug/Moonminer.exe
	Moonminer/Debug/Moonminer.ilk
	Moonminer/Debug/Moonminer.pdb
	Moonminer/Moonminer.sdf
	Moonminer/Moonminer.v11.suo
	Moonminer/Moonminer/Debug/Main.obj
	Moonminer/Moonminer/Debug/Moonminer.log
	Moonminer/Moonminer/Debug/link.read.1.tlog
	Moonminer/Moonminer/Debug/vc110.idb
	Moonminer/Moonminer/Debug/vc110.pdb
comit

comit
commit

comit
visio uml

class diagram and komponent diagram
Merge remote-tracking branch 'origin/master' into Peter

Conflicts:
	Moonminer/Debug/Moonminer.exe
	Moonminer/Debug/Moonminer.ilk
	Moonminer/Debug/Moonminer.pdb
	Moonminer/Moonminer.sdf
	Moonminer/Moonminer.v11.suo
	Moonminer/Moonminer/Debug/Main.obj
	Moonminer/Moonminer/Debug/Moonminer.log
	Moonminer/Moonminer/Debug/link.read.1.tlog
	Moonminer/Moonminer/Debug/vc110.idb
	Moonminer/Moonminer/Debug/vc110.pdb