Added twitter oauth keys.
Merge branch 'master' of https://github.com/S73417H/p2

Conflicts:
	config/initializers/omniauth.rb