fix function name minus->sub so included code will run
Merge remote-tracking branch 'upstream/master'
pset2 updates
conflict resolution
Add ps1 solution set
cleaned up ps2 soln set
Add pset3 draft
fix up solution set
revert ps1 to no soln set, add pset3
Rename iteration files, add to pip2 source
remove parens from print statements
revert ps1 pre-solns
Merge pull request #67 from aerenchyma/ps1-solns

Add pset1 solution set
Merge branch 'master' of github.com:presnick/runestone
function minus renamed as sub
Merge branch 'ps3-F14' of https://github.com/aerenchyma/runestone into aerenchyma-ps3-F14

Conflicts:
	pip2/source/Assignments/ps1.rst
Merge branch 'aerenchyma-ps3-F14'
Merge branch 'book-updates-iteration' of https://github.com/aerenchyma/runestone into aerenchyma-book-updates-iteration

Conflicts:
	pip2/source/Assignments/ps1.rst
Merge branch 'aerenchyma-book-updates-iteration'
first release of week 3 for pip2