merge conflict fix
merge conflict fix

uTool-io/meteor-hackathon-2015,uTool-io/meteor-hackathon-2015,uTool-io/meteor-hackathon-2015,amazingBastard/meteor-hackathon-2015,amazingBastard/meteor-hackathon-2015,amazingBastard/meteor-hackathon-2015