Commit
Merge branch 'master' of https://github.com/coffeemilkcrazy/hola_dev

Conflicts:
	.DS_Store