updated badges!
Updated badges
Merge branch 'develop'

Conflicts:
	readme.md
Updated badge.
Cleaned up some comments.