ignoring .suo's
Merge remote-tracking branch 'origin/master'

Conflicts:
	SpellSlingerV1.0/SpellSlingerV1.0.v11.suo