pull request for proj2

@andrewberls
-350 pts