Greg changed the license
Merge branch 'master' of github.com:lucasweiblen/playing_with_git

Conflicts:
	LICENSE.txt