Updating Aarons changes
Merge branch 'master' of https://github.com/CS4311-TBA/visko