changes for better testing stuff
Merge branch 'master' into short_methods

Conflicts:
	Gemfile