add models & associations
fix merge conflixt in routes
Merge branch 'master' of github.com:den1k/whiteink
add omniauth middleware, add environment variables
added twitter oauth+ sessions - see notes
added twitter oauth+ sessions - see notes