you can now add beacons on the client side!
Merge branch 'master' of https://github.com/Sloth6/Beacon

Conflicts:
	app/server/beacon.js

Just took the other one. I trust you!