removed custom solution folder
Merge branch 'master' of https://github.com/jjmartin/ZuoraMagic

Conflicts:
	ZuoraMagic/ZuoraMagic.csproj