Properly serialize token data
Merge branch 'master' of https://github.com/CS4431/database

Conflicts:
	src/routes.rb