no message
Merge branch 'master' of https://github.com/kylepeterson/343Final

Conflicts:
	js/rank.js