Master and devel merged, executable restructured
Edited executable
Modified executable
Merge branch 'master' of http://github.com/jagen31/FRCVision2014 into devel

Conflicts:
	HotTarget/CMakeFiles/run.dir/CXX.includecache
	HotTarget/CMakeLists.txt
	HotTarget/CTestTestfile.cmake
	HotTarget/Testing/TAG
	HotTarget/Testing/Temporary/CTestCostData.txt
	HotTarget/Testing/Temporary/LastTest.log
	HotTarget/Testing/Temporary/LastTestsFailed.log
	HotTarget/a.out
	HotTarget/build/CTestTestfile.cmake
	HotTarget/build/Testing/Temporary/CTestCostData.txt
	HotTarget/build/Testing/Temporary/LastTest.log
	HotTarget/build/Testing/Temporary/LastTestsFailed.log
	HotTarget/build/run
	HotTarget/run
	src/run.cpp~
Modified executable.
Deleted binaries.