.
Merge branch 'master' of https://github.com/terkill/AMP

Conflicts:
	report/content/discussion.tex