Theory
Merge branch 'master' of https://github.com/josago/aaa2013

Conflicts:
	tex/report3.tex