30/04
Merge branch 'master' of https://github.com/diegomrod95/ComputerStore

Conflicts:
	.gitignore