Changes in the report, intro and theory
Merge branch 'master' of https://github.com/josago/aaa2013

Conflicts:
	tex/report3.aux
	tex/report3.log
	tex/report3.pdf
Merge branch 'master' of https://github.com/josago/aaa2013