added make and main
Merge branch 'hw1experiment'