pull request for proj1

@andrewberls 
-500 points