SourceTree conflict resolving
SourceTree conflict resolving

FosterA/MUApplicationPortal,bar5z6/swe2015groupl,qltf8/finalProject,FosterA/MUApplicationPortal,qltf8/finalProject,FosterA/MUApplicationPortal,qltf8/finalProject,qltf8/groupproject,bar5z6/swe2015groupl,bar5z6/swe2015groupl,qltf8/groupproject,qltf8/groupproject,qltf8/finalProject,qltf8/groupproject,FosterA/MUApplicationPortal,bar5z6/swe2015groupl