listener nail and technic
Merge branch 'master' of https://github.com/ericluong/voila

Conflicts:
	public/js/main.js