FIXED COLLISION OMG YES AND ALSO RAFT WORKS
Merge branch 'master' of https://github.com/YRSNorwich/Datamon

Conflicts:
	js/main.js