localCommit
Merge branch 'master' of https://github.com/RaazTripathi/ProjInv

Conflicts:
	build/classes/.gitignore
commit