change
Merge branch 'master' of https://github.com/sanzodown/Ruby_twitter

Conflicts:
	RubyTwitter/db/development.sqlite3
pgm