Greg changes
Merge branch 'master' of github.com:lucasweiblen/playing_with_git

Conflicts:
	README.txt