init.
padrino init.
padrino configured.
public folder reorganized
bootstrapped
Merge branch 'master' of github.com:icco/what

Conflicts:
	.gitignore
	README.md