Revert "asg1 v0.2"

This reverts commit c826aa37f97cf785fb3228f60d4fb80ea8a3439c.
Merge branch 'asg1' into asg2

Conflicts:
	README.txt