Set up a basic structure
Add a default config file
Merge branch 'master' of github.com:DesertBot/DesertBot

Conflicts:
	.gitignore