removing pro.user
removing pro.user
Merge branch 'master' of https://github.com/dsc0003/6DOFC

Conflicts:
	6DOFEngineeringScreen/6DOFEngineeringScreen.pro.user