Merge pull request #2 from joshski/master

37 pieces of flair
codeship badge
Update README.md
Merge remote-tracking branch 'origin/pr/3'

Conflicts:
	README.md