update token
Merge branch 'master' of https://github.com/pcowgill/concertpage

Conflicts:
	.DS_Store