hmmmmmm fist commit?
hmmmmmm
trying to use my own branch
PREPARE TO BE DELETED
Merge branch 'xjs' of http://github.com/nrkefauver/CSE5236_Group1
XAVIER IS NOW DELETED
initial checkin hinkling
Merge branch 'master' of http://github.com/nrkefauver/CSE5236_Group1 into nrk
testing