Removed thin; added less
Merge branch 'gemfile_test'

Conflicts:
	Gemfile