Applying gitignore
Applying gitignore
Merge branch 'master' of github.com:hendriqis/systemsetup

Conflicts:
	.gitignore
	SystemSetup/BusinessRules/obj/Debug/BusinessRules.vbproj.FileListAbsolute.txt
	SystemSetup/Common/obj/Debug/Common.vbproj.FileListAbsolute.txt
	SystemSetup/Security/obj/Debug/Security.vbproj.FileListAbsolute.txt
	SystemSetup/SystemFramework/obj/Debug/SystemFramework.vbproj.FileListAbsolute.txt
	SystemSetup/SystemSetup.suo
	Web/obj/Debug/Web.vbproj.FileListAbsolute.txt