coverage
Merge branch 'coveralls'

Conflicts:
	Gemfile.lock