Changed varible names to make documentation simple.
Merge branch 'master' of https://github.com/boubre/CSC4444_Project