removed *.*~ temp files from git
Completed Cplex implementation, Need to test for sanity
Merge branch 'prop_labels'

Conflicts:
	.gitignore