second commit
removed wrong and added correct file
Moved dhans01's project to src/rocketLaunch
Merge branch 'dhans01'

Conflicts:
	Makefile