Merge pull request #66 from g2-aj/branch_alshahna

Branch alshahna
final gui changed added
Merge branch 'master' of https://github.com/g2-aj/cs304 into branch_alshahna