badge commit
Merge branch 'badge'
Merge branch 'master' of https://github.com/16twenty/meganmane

Conflicts:
	assets/css/style.css