Test commit1
test commt2
Changes made at 17:41
Changes made in 17:43
Merge remote-tracking branch 'bitbucket/master'
commit to bitbuket in 17:59
commit to bitbuket in 18:00
Commit in bitbucket in 18:00
Commit to bitbucket in 18:03
Merge remote-tracking branch 'origin/master'
Removed unneeded file in github at 18:05
Merge branch 'master' of https://bitbucket.org/jibeex/private-roannotation

Conflicts:
	ROAnnotation.xcodeproj/project.xcworkspace/xcshareddata/ROAnnotation.xccheckout