adding omniauth-middle
update gitignore
fixing conflicts