Here is a commit message
Merge branch 'master' of github.com:nhachey/InClass-Practice

Conflicts:
	README.md
New Files