did more things and cleaned up code a little
Merge branch 'master' of https://github.com/jaj2610/PennappsSpring2013