Updated gitignore and removed extraneous files.
Fixed conflict.
Merge branch 'master' of github.com:CarrotsAreMediocre/StarryPy

Conflicts:
	config/config.json