First commit
Merge remote-tracking branch 'frandemanueles/master'

Conflicts:
	.gitignore