working product
Merge https://github.com/xinyi3/301-assignment1
df
Conflicts:
	README.md