modified:   packet.c
Merge branch 'master' of https://github.com/MosesLab/flightSW

Conflicts:
	MOSES_FC/packet.c

	modified:   hkdown.c
	modified:   packet.c
	modified:   packet.h
	modified:   packetType.h
Merge branch 'master' of https://github.com/MosesLab/flightSW
hope it merges I didn't change nothin
Merge branch 'master' of https://github.com/MosesLab/flightSW
Merge branch 'master' of https://github.com/MosesLab/flightSW
Merge branch 'master' of https://github.com/MosesLab/flightSW
Merge branch 'master' of https://github.com/MosesLab/flightSW
Merge branch 'master' of https://github.com/MosesLab/flightSW
Merge branch 'master' of https://github.com/MosesLab/flightSW
Merge branch 'master' of https://github.com/MosesLab/flightSW
Merge branch 'master' of https://github.com/MosesLab/flightSW
Merge branch 'master' of https://github.com/MosesLab/flightSW
Merge branch 'master' of https://github.com/MosesLab/flightSW
Merge branch 'master' of https://github.com/MosesLab/flightSW
Merge branch 'master' of https://github.com/MosesLab/flightSW
Merge branch 'master' of https://github.com/MosesLab/flightSW
Merge branch 'master' of https://github.com/MosesLab/flightSW
Merge branch 'master' of https://github.com/MosesLab/flightSW
Merge branch 'master' of https://github.com/MosesLab/flightSW
Merge branch 'master' of https://github.com/MosesLab/flightSW