Primer commt refactor
Merge branch 'master' of https://github.com/Galanodell/Test2

Conflicts:
	.gitignore