gem
Merge branch 'master' of github.com:azazelo/oa
Merge branch 'master' of github.com:azazelo/oa
Merge branch 'master' of github.com:azazelo/oa
Merge branch 'master' of github.com:azazelo/oa
Merge branch 'master' of github.com:azazelo/oa
Merge branch 'master' of github.com:azazelo/oa
Merge branch 'master' of github.com:azazelo/oa
Merge branch 'master' of github.com:azazelo/oa
Merge branch 'master' of github.com:azazelo/oa
Merge branch 'master' of github.com:azazelo/oa
Merge branch 'master' of github.com:azazelo/oa
Merge branch 'master' of github.com:azazelo/oa
Merge branch 'master' of github.com:azazelo/oa
routes
Merge branch 'master' of github.com:azazelo/oa

Conflicts:
	config/routes.rb
Merge branch 'master' of github.com:azazelo/oa
routes