wip styling
Merge branch 'master' of https://github.com/jkatsnelson/fantasygithub

Conflicts:
	server/coffee/server.coffee
	server/js/server.js