new variable names
Merge branch 'master' of github.com:/tmagrino/cs6113-project
remove export at top