workspace
library add
Merge branch 'apollo' into atlas
new mediator
Merge branch 'master' into atlas

Conflicts:
	libTwoget/libTwoget.xcodeproj/project.pbxproj

twogetWorkspace.xcworkspace/xcuserdata/goycolea.xcuserdatad/UserInterfac
eState.xcuserstate
mediator

now
Merge branch 'atlas' of https://github.com/hgoycoolea/twoget.ios
go

go
changes
Merge branch 'master' into atlas

Conflicts:
	.gitignore

twogetWorkspace.xcworkspace/xcuserdata/goycolea.xcuserdatad/UserInterfac
eState.xcuserstate
Merge branch 'atlas' of https://github.com/hgoycoolea/twoget.ios into atlas

Conflicts:
	.gitignore

twogetWorkspace.xcworkspace/xcuserdata/goycolea.xcuserdatad/UserInterfac
eState.xcuserstate