last chnage!!!
Merge branch 'master' of https://github.com/toxicseaweed/310lab2

Conflicts:
	read.me