Add merge conflict info.
Add merge conflict info.

RoryAndrews/meteor-browser-history,aljonpreza/meteor-kamanu,brianjyriel/digits,MatthewYee/meteor-kamanu,TransWebT/meteor-autoform-ace-editor-demo,ics-software-engineering/meteor-application-template,skchun/textbookmania,symorikawa/textbookmania,symorikawa/templateTest,skchun/meteor-castle-high,mahoe7/meteor-castle-high,kelsieayamakawa/digits,khongnaw/digits,clintmorimoto/castest,RoryAndrews/meteor-browser-history,symorikawa/textbookmania,aljonpreza/meteor-browser-history,rshin808/digits,mahoe7/textbookmania,mkshimod/digits,RoryAndrews/digits,mike31s/textboookmania,rshin808/CSBCDDashboard,mkshimod/ics415-finalproject,khongnaw/textbookmania,kelsieayamakawa/meteor-castle-high,aljonpreza/meteor-kamanu,aljonpreza/meteor-browser-history,mike31s/digits,aljonpreza/digits,skchun/meteor-kamanu,ics-software-engineering/meteor-application-template,brianjyriel/meteor-kamanu,MatthewYee/meteor-castle-high,symorikawa/digits,rshin808/meteor-castle-high,mahoe7/meteor-kamanu,aljonpreza/textbookmania,mike31s/meteor-castle-high,ics-software-engineering/meteor-example-uh-cas,skchun/meteor-browser-history,henricasanova/divelog_manager,mike31s/textboookmania,textbookmania/SkyBlue,brianjyriel/digits,symorikawa/digits,MatthewYee/digits,rshin808/CSBCDDashboard,kelsieayamakawa/textbookmania,skchun/textbookmania,rshin808/meteor-browser-history,mahoe7/meteor-kamanu,mkshimod/meteor-browser-history,mike31s/meteor-castle-high,MatthewYee/meteor-application-template,kelsieayamakawa/meteor-browser-history,skchun/digits,MatthewYee/digits,rshin808/meteor-browser-history,skchun/digits,brianjyriel/meteor-kamanu,kelsieayamakawa/meteor-castle-high,skchun/meteor-kamanu,RoryAndrews/meteor-castle-high,mahoe7/meteor-castle-high,brianjyriel/meteor-browser-history,rshin808/meteor-kamanu,aljonpreza/meteor-castle-high,mkshimod/ics415-finalproject,mike31s/digits,mahoe7/textbookmania,mkshimod/digits,theVacay/vacay,rshin808/meteor-kamanu,MatthewYee/meteor-kamanu,rshin808/digits,kelsieayamakawa/textbookmania,mike31s/meteor-kamanu,symorikawa/templateTest,brianjyriel/meteor-browser-history,mike31s/meteor-kamanu,kelsieayamakawa/digits,MatthewYee/meteor-browser-history,MatthewYee/meteor-metrostyleUI,MatthewYee/meteor-castle-high,aljonpreza/textbookmania,aljonpreza/meteor-castle-high,skchun/meteor-castle-high,MatthewYee/meteor-application-template,aljonpreza/digits,RoryAndrews/digits,mkshimod/meteor-browser-history,clintmorimoto/castest,MatthewYee/meteor-metrostyleUI,ics-software-engineering/meteor-example-uh-cas,rshin808/meteor-castle-high,TransWebT/meteor-autoform-ace-editor-demo,skchun/meteor-browser-history,khongnaw/digits,textbookmania/SkyBlue,theVacay/vacay,kelsieayamakawa/meteor-kamanu,RoryAndrews/meteor-castle-high,RoryAndrews/textbookmania,kelsieayamakawa/meteor-browser-history,khongnaw/textbookmania,kelsieayamakawa/meteor-kamanu,henricasanova/divelog_manager,RoryAndrews/textbookmania,MatthewYee/meteor-browser-history