nope

Signed-off-by: Moarten <sailor1991@msn.com>
Merge branch 'DEV' of github.com:Commandersatisfied/HAMTEC into DEV

Conflicts:
	Hamtec/Hamtec.suo
	Hamtec/Hamtec/App_Data/hamtec.mdf
	Hamtec/Hamtec/App_Data/hamtec_log.LDF

Signed-off-by: Moarten <sailor1991@msn.com>
Merge branch 'DEV' of github.com:Commandersatisfied/HAMTEC into DEV

Conflicts:
	Hamtec/Hamtec.suo
	Hamtec/Hamtec/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Signed-off-by: Moarten <sailor1991@msn.com>