Fix conflicts in ArekCzarnik-master

.travis.yml

@@ -4,7 +4,7 @@ go:
   - 1.6
   - tip
 
-go_import_path: github.com/jochasinga/rx
+go_import_path: github.com/jochasinga/rxgo
 
 install:
   - go get github.com/mattn/goveralls

README.md

@@ -54,9 +54,9 @@ Certain types, such as `observer.Observer` and `observable.Observable` are organ
 ```go
 
 import (
-	"github.com/jochasinga/rx"
-	"github.com/jochasinga/rx/observer"
-	"github.com/jochasinga/rx/observable"
+	"github.com/jochasinga/rxgo"
+	"github.com/jochasinga/rxgo/observer"
+	"github.com/jochasinga/rxgo/observable"
 	//...
 )
 
@@ -111,8 +111,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/jochasinga/rx"
-	"github.com/jochasinga/rx/handlers"
+	"github.com/jochasinga/rxgo"
+	"github.com/jochasinga/rxgo/handlers"
 )
 
 func main() {

connectable/connectable.go

@@ -5,11 +5,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/jochasinga/rx"
-	"github.com/jochasinga/rx/fx"
-	"github.com/jochasinga/rx/observable"
-	"github.com/jochasinga/rx/observer"
-	"github.com/jochasinga/rx/subscription"
+	"github.com/jochasinga/rxgo"
+	"github.com/jochasinga/rxgo/fx"
+	"github.com/jochasinga/rxgo/observable"
+	"github.com/jochasinga/rxgo/observer"
+	"github.com/jochasinga/rxgo/subscription"
 )
 
 // Connectable is an Observable which can subscribe several

connectable/connectable_test.go

@@ -5,10 +5,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jochasinga/rx/fx"
-	"github.com/jochasinga/rx/handlers"
-	"github.com/jochasinga/rx/iterable"
-	"github.com/jochasinga/rx/observer"
+	"github.com/jochasinga/rxgo/fx"
+	"github.com/jochasinga/rxgo/handlers"
+	"github.com/jochasinga/rxgo/iterable"
+	"github.com/jochasinga/rxgo/observer"
 
 	"github.com/stretchr/testify/assert"
 )

examples/reactive_sum/sum.go

@@ -30,8 +30,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/jochasinga/rx/handlers"
-	"github.com/jochasinga/rx/observable"
+	"github.com/jochasinga/rxgo/handlers"
+	"github.com/jochasinga/rxgo/observable"
 )
 
 func main() {

examples/scroll/server.go

@@ -31,9 +31,9 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/jochasinga/rx/handlers"
-	"github.com/jochasinga/rx/observable"
-	"github.com/jochasinga/rx/observer"
+	"github.com/jochasinga/rxgo/handlers"
+	"github.com/jochasinga/rxgo/observable"
+	"github.com/jochasinga/rxgo/observer"
 )
 
 var upgrader = websocket.Upgrader{

handlers/handlers_test.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/jochasinga/rx"
+	"github.com/jochasinga/rxgo"
 	"github.com/stretchr/testify/assert"
 )
 

iterable/iterable.go

@@ -2,7 +2,7 @@
 // sequences of empty interface such as slice and channel to an Iterator.
 package iterable
 
-import "github.com/jochasinga/rx/errors"
+import "github.com/jochasinga/rxgo/errors"
 
 // Iterable converts channel and slice into an Iterator.
 type Iterable <-chan interface{}

iterable/iterable_test.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/jochasinga/rx"
+	"github.com/jochasinga/rxgo"
 	"github.com/stretchr/testify/assert"
 )
 

observable/observable.go

@@ -4,13 +4,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/jochasinga/rx"
-	"github.com/jochasinga/rx/errors"
-	"github.com/jochasinga/rx/fx"
-	"github.com/jochasinga/rx/handlers"
-	"github.com/jochasinga/rx/observer"
-	"github.com/jochasinga/rx/subscription"
-
+	"github.com/jochasinga/rxgo"
+	"github.com/jochasinga/rxgo/errors"
+	"github.com/jochasinga/rxgo/fx"
+	"github.com/jochasinga/rxgo/handlers"
+	"github.com/jochasinga/rxgo/observer"
+	"github.com/jochasinga/rxgo/subscription"
 )
 
 // Observable is a basic observable channel

observable/observable_test.go

@@ -6,10 +6,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jochasinga/rx/fx"
-	"github.com/jochasinga/rx/handlers"
-	"github.com/jochasinga/rx/iterable"
-	"github.com/jochasinga/rx/observer"
+	"github.com/jochasinga/rxgo/fx"
+	"github.com/jochasinga/rxgo/handlers"
+	"github.com/jochasinga/rxgo/iterable"
+	"github.com/jochasinga/rxgo/observer"
 
 	"github.com/stretchr/testify/assert"
 )

observer/observer.go

@@ -1,8 +1,8 @@
 package observer
 
 import (
-	"github.com/jochasinga/rx"
-	"github.com/jochasinga/rx/handlers"
+	"github.com/jochasinga/rxgo"
+	"github.com/jochasinga/rxgo/handlers"
 )
 
 // Observer represents a group of EventHandlers.

observer/observer_test.go

@@ -3,7 +3,7 @@ package observer
 import (
 	"testing"
 
-	"github.com/jochasinga/rx/handlers"
+	"github.com/jochasinga/rxgo/handlers"
 	"github.com/stretchr/testify/assert"
 )