Addition of assignment1 parts 1 and 2 straight from SVN