Changed previous history viewing, added some stuff to viewing history
Merge branch 'master' of ssh://athena.dialup.mit.edu/afs/athena.mit.edu/course/6/6.005/git/sp13/projects/guichat/alvarom-aybose-holliman
Really hope i correctly fixed the conflict