updated so it can output a file now
Merge branch 'master' of https://github.com/xcatz/cs421ProjectA