I have no idea what Im doing
Merge branch 'master' of https://github.com/Vitiell0/drawbridge2

Conflicts:
	client/main.html
	lib/router.js
	server/conflicts.js

why are there so many files?