fixed merge conflicts
fixed merge conflicts

montrealrb/Montreal.rb,AndyObtiva/Montreal.rb,AndyObtiva/Montreal.rb,montrealrb/Montreal.rb,AleksandrKudashkin/Montreal.rb,AleksandrKudashkin/Montreal.rb,montrealrb/Montreal.rb,AndyObtiva/Montreal.rb,AleksandrKudashkin/Montreal.rb