Submitted version
Merge branch 'master' of https://github.com/scku/CS131-HW1

Conflicts:
	hw1.ml