Commiting non working code
Commiting non working code
Pisnam i ve4e ot commit-i
Merge commit '811f219ab2cee01fd7ac6c03edf058c1d784ebf8'

Conflicts:
	VineScope/VineScope.jsproj.user
	VineScope/js/default.js
	VineScope/pages/home/home.html
	VineScopeClient.v11.suo
fixed merge
Merge remote-tracking branch 'VineClient/master'

Conflicts:
	VineScopeClient.v11.suo