hope this works
Merge branch 'master' of github.com:davidhuff2014/testproject

Conflicts:
	something_to_pull

trying to get this complete ed
commiting all my pre-course files