First version of CF completed.
Merge branch 'master' of https://github.com/AHudon/6611_TeamBravo