Merge branch 'development' of https://github.com/chrisivens/trashmap_server into development

Conflicts:
	.gitignore
Merge branch 'development' of https://github.com/Trashboard/trashmap_server into development
Using config.json for client id and secret
Add config.json to the ignored files list