Fixed problem 2 of part 3
Merge branch 'master' of https://github.com/KMarino/RIPFall2014P1