CNIC
Merge remote-tracking branch 'origin/master'

Conflicts:
	CALVRI/CALVRI.v12.suo
	CALVRI/CALVRI/Models/CNIC.cs
	CALVRI/CALVRI/Views/CNIC/Index.cshtml
	CALVRI/CALVRI/bin/CALVRI.dll
	CALVRI/CALVRI/bin/CALVRI.pdb
	CALVRI/CALVRI/obj/Debug/CALVRI.dll
	CALVRI/CALVRI/obj/Debug/CALVRI.pdb
	CALVRI/CALVRI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Commit
Merge branch 'master' of https://github.com/ProjectCobra/Starship

Conflicts:
	CALVRI/CALVRI.v12.suo
	CALVRI/CALVRI/Web.config
	CALVRI/CALVRI/bin/CALVRI.dll
	CALVRI/CALVRI/bin/CALVRI.pdb
	CALVRI/CALVRI/obj/Debug/CALVRI.csproj.FileListAbsolute.txt
	CALVRI/CALVRI/obj/Debug/CALVRI.csprojResolveAssemblyReference.cache
	CALVRI/CALVRI/obj/Debug/CALVRI.dll
	CALVRI/CALVRI/obj/Debug/CALVRI.pdb
	CALVRI/CALVRI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache