Join button should work!
Merge branch 'master' of https://github.com/Sloth6/Beacon

Conflicts:
	app/client/js/index-controller.js
did i fix it?
background image
hopefully the background fix
new looks
mudafukin brackets
not sure what i changed, but this will be overwritten by there server anyways.
Merge commit '4f89cdc19e13932321593e8b2fbe321ec10c936d'

Conflicts:
	app/client/js/beacon.js
	app/client/js/index-controller.js