Merge branch 'master' of https://github.com/Trrnts/Trrnts into develop
Comment out buggy geolocate code. Add extra comments for bencoded message object
Merge branch 'develop' of https://github.com/Trrnts/Trrnts into develop

Conflicts:
	client/dist/main.min.js