asd
Merge branch 'master' of https://github.com/leandromacrini/MyStock

Conflicts:
	public/css/style.css