Fixed some constructors
Merge branch 'master' of https://github.com/cowpig/Comp-354-Group-Project