I am adding two new files
I added text to this file.
Added experimental txt
Fixed problem
Initial commit
Merge branch 'master' of github.com:mcdermjame/gitWorkshop
Merge branch 'master' of github.com:mcdermjame/git-workshop

Conflicts:
	gamow.txt