fix bugs
Merge branch 'master' of github.com:PigeonNerd/15746_assignment1