added partner's stuff; git was behaving really funky so he couldn't push it
Merge branch 'master' of https://github.com/awardell/Lab6.2