a
Merge remote-tracking branch 'origin/master'

Conflicts:
	BadIdeaGenerator/Bad Idea Generator Results.txt