comments in header
Merge branch 'master' of https://github.com/amsjustin/sagra-dell-uva-opencart

Conflicts:
	catalog/controller/account/account.php
	system/logs/error.txt