final version
Merge branch 'master' of https://github.com/asmark/CS349_A1