initial checkin hinkling
Merge branch 'master' of http://github.com/nrkefauver/CSE5236_Group1 into nrk