second commit
Added two more files to try git
Merge branch 'master' of http://github.com/panda123/cs107

Conflicts:
	README