Added operator override to main function (still not working yet)
Merge branch 'master' of https://github.com/TravisNoles/Spring2014.git