added signalr
trying to fix git conflicts
resolving conflicts