new app id
Merge branch 'master' of github.com:thejefflarson/nypl-hack

Conflicts:
	app/assets/javascripts/checkin.js