fixed a bug i introduced when i merged master into my branch.
fixed a bug i introduced when i merged master into my branch.

jaboyles/CFTD_Senior_Project,jaboyles/CFTD_Senior_Project,jaboyles/CFTD_Senior_Project,jaboyles/CFTD_Senior_Project