Bad commit!!!
Fixing Bad Commit!
Merge remote-tracking branch 'origin/master'

Conflicts:
	Console/App.config