Cleaning up.
Merge branch 'master' of https://github.com/jaguirre/APRA2014

Conflicts:
	section_introduction.tex