Updating demo page with feedback
Merge branch 'master' into demo-page

Moved javascript to scan page

Conflicts:
	app/views/demo/show.html.erb
externalizing qr code to be in common coffee script
Merge pull request #4 from StephenSmithwick/demo-page

Updating demo page with feedback