newest
blah
Merge branch 'master' of https://github.com/michaeltien/squash

Conflicts:
	Gemfile.lock