remove .pro.user from controle version
Merge branch 'master' of github.com:linksite/SimTex

Conflicts:
	trunc/source/SimTex.pro.user