Added another Ubuntu 12.10 Server box to the list
Merge branch 'master' of git://github.com/aldoborrero/vagrantboxes-heroku into aldoborrero-master

Conflicts:
	www/index.html