Assignment 1 and 2

Master wiki