New
NewCommit
Merge branch 'master' of https://github.com/Sreeni34/cs3homework1

Conflicts:
	README

Conflict Resolve