test
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
github oauth
"Count to quota", "select sample gi url using a click", other beautifications