Initial Commit
Rework main to include feedback
added more feedback
Changed feedback model
A bit more motivation
Much more motivation
Handle when the user does really stupid things
Merge branch 'MoreMotivating'

Conflicts:
	GitMerging.java
conflicts resolved
Merge branch 'master' of https://github.com/mgort/GitMerge