Change
Merge remote-tracking branch 'origin/master'

Conflicts:
	SolidWorks 2-22-14/Thumbs.db
Merge branch 'master' of https://github.com/m2i/CySat-Structure

Conflicts:
	SolidWorks 2-22-14/Thumbs.db