Fixed some tabbing issues in main file
Merge branch 'master' of github.com:davidgross/cptr355-assn9
shape2d mods