fixing?
Merge branch 'GUI_Branch_5-30-14' of https://github.com/lansdon/cpts483_drc into GUI_Branch_5-30-14