committing to pull changes from desktop from a few days ago
Merge branch 'master' of https://github.com/techjeffharris/freebox-finder

Conflicts:
	pub/freebox-finder.js
	views/index.jade