added twitter auth. hasnt been debugged yet
fixed merge issues

Merge branch 'master' of github.com:CityEventHub/city-event-hub

Conflicts:
	routes/api/auth.js
Committing code for Jon to look at