Testing VPP Change

Leon try updating this.
Updated GitIgnore (vpp~* files)

We don't want those annoying temporary files added to our repo.
Merge branch 'master' of https://github.com/BestTeamSEA/oodp_project

Conflicts:
	Restaurant Reservation and Point of Sale System.vpp