repo update

no code (visualstudio files)
Merge remote-tracking branch 'origin/heuristic-implementation' into heuristic-implementation

Conflicts:
	ProjectFlounder/SquareSolution/SquareSolution.v11.suo