git pull to update
unmerged files error
push to master
Merge branch 'master' of https://github.com/UTAR-DIECS-SCC-2014-05/SCC.Proj.2014.05.Team06 into leeteck

Conflicts:
	C#/MyProject/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache