Ignore files
Merge remote-tracking branch 'origin/master'

Conflicts:
	ThesisTest.sdf
	ThesisTest.v12.suo