Removed the keys doh
Merge branch 'master' of github.com:hiafi/342Project

Conflicts:
	vm_key