a few syntax changes
Merge branch 'master' of https://github.com/KMarino/RIPFall2014P1