Did tons of work

And made a very creative commit message...
It works, now we only need to make it work well
Only thing left to do: comments
I added a TODO.

You can see it in the ActionItems window
Added reset functionality
Merge remote-tracking branch 'origin/master'

Conflicts:

	ColoredWordsExperiment/src/coloredwordsexperiment/ColoredWordsExperiment.java
	ColoredWordsExperiment/src/coloredwordsexperiment/MatchingWords.java