init commit
	modified:   CMakeLists.txt
	new file:   ProjectProposal.txt
	modified:   README.md
	modified:   package.xml
fixing merge
	modified:   CMakeLists.txt
Merge branch 'origin/ARdrone' of https://github.com/NathanBland/missionImpossible into Broken-Bran

Conflicts:
	CMakeLists.txt
	package.xml
	src/main.cpp
Merge pull request #3 from NathanBland/Broken-Bran

Broken bran