Changes to Pretest A and Result AA
Merge branch 'master' of https://github.com/danielignatius/Daniel-Setup-Files

Conflicts:
	result_aa.php