Conflict
conflict fixed
videoshere.txt
Player.cshtml
AssemblyInfo.cs
Merge branch 'master' of https://github.com/ifaniqbal/fpnet_kiss

Conflicts:
	KISS/KISS/Views/Transaction/Create.cshtml
deleted unnecessary