deleted:    config/whitelist.txt
	modified:   data/whitelist.txt
Merge branch 'master' of https://github.com/LobbyZ/nexus-station