fix repo
join with qrcode
Merge branch 'master' of heroku.com:pugrace

Conflicts:
	app.js
qr code
responsive