app skeleton
Merge branch 'master' of https://github.com/vilcabamba/vilcraft

Conflicts:
	.gitignore