Removed weird project.js~ file
Merge branch 'master' of https://github.com/wspurgin/Crack-n

Conflicts:
	packages/custom/project/server/models/project.js~