fix function name minus->sub so included code will run
Merge remote-tracking branch 'upstream/master'
pset2 updates
conflict resolution
Add ps1 solution set
fix up solution set
Merge pull request #67 from aerenchyma/ps1-solns

Add pset1 solution set