Just doing my homework
Hope this works
Merge branch 'master' into EricThomas

Conflicts:
	run
Trying to do homework2
Merge branch 'master' into EricThomas
Adding my name for homework3
Merge branch 'EricThomas'

Conflicts:
	moving/runme
adding homework3
doing hw3