Added resize option as well as random id if no id is passed.
Merge branch 'master' of https://github.com/EmilS/Octocat

Conflicts:
	Vagrantfile
	buildVagrant.sh
	package.json
	server.js