state
Merge branch 'master' of https://github.com/DankarSilob/hola2

Conflicts:
	.DS_Store