flip-pee-do
Merge branch 'master' of github.com:Zephoku/Endorser

Conflicts:
	public/css/profile.css
	views/profile.jade
Merge branch 'master' of github.com:Zephoku/Endorser

Conflicts:
	public/css/profile.css
Merge branch 'master' of github.com:Zephoku/Endorser
changed some text format in badge display
Merge branch 'master' of github.com:Zephoku/Endorser

Conflicts:
	public/css/profile.css