just git
Signed-off-by: Sander
Merge branch 'DEV' of github.com:Commandersatisfied/HAMTEC into DEV

Conflicts:
	Hamtec/Hamtec.suo