Class Checkins
Class checkin
Merge branch 'master' of https://github.com/joshrouwhorst/Tag

Conflicts:
	server.js