ignore cache files
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	SL136/SL136.v12.suo