testing position changes
more tests
removed unneeded files
fix
final version of files-the template looks good now and scales correctly
Merge branch 'current_07.10'
commented redundant model, view and controller
Merge branch 'master' of https://github.com/egelon/iDog-Website

Conflicts:
	css/common.css
	templates/errorTemplate.php