---- Aplication Development ----

Conflicts:
	vagrant/modules/example42/puppi

Conflicts:
	README.md