hmmm

can I merge this?
Merge branch 'master' of https://github.com/grahamzibar/AirChat

Conflicts:
	src/js/core/main.js
	src/js/core/model/Bonjour.js
ugh

do I have to write a comment EVERY FUCKING TIME?!