commit
Merge branch 'master' of https://github.com/dwallc/POLI5003
class: 2-13-14 edits