android final code along with Vagrantfile forward port
Merge branch 'master' of github.com:llamadigital/zombies

Conflicts:
	Vagrantfile