Merged files
Merge branch 'master' of https://github.com/gargoyle3333/BotSelector.git

Conflicts:
	BotSelector/src/net/mike/bot/MainDisplay.java
	BotSelector/todo.txt