Merge remote-tracking branch 'origin/Cole'
unneccessary code
Merge remote-tracking branch 'origin/master' into Cole