edited twitter oath key and secret
Merge branch 'master' of github.com:sh0w/serendipity

Conflicts:
	config/initializers/devise.rb