First commit of assignment1
Merged