vs project
Merge branch 'goSQL' of github.com:stellar/stellard into goSQL
filters
Merge branch 'goSQL' of github.com:stellar/stellard into goSQL

Conflicts:
	Builds/VisualStudio2013/RippleD.vcxproj.filters
filters