Echo Coffee
Merge branch 'master' of github.com:w33ble/public-wifi

Conflicts:
	phoenix.md