Assignment2

Assignment 2 is complete. Review and merge with master - which seems to have one extra change since the last merge.