Merge branch 'master' of https://github.com/0i0/mayorshow

Conflicts:
	app.js