removed <<<<<<<<< HEAD
Merge remote-tracking branch 'origin/master' into GUI_Branch_5-30-14
Merge branch 'GUI_Branch_5-30-14' of https://github.com/lansdon/cpts483_drc into GUI_Branch_5-30-14