comitando
Merge branch 'master' of github.com:ajholanda/psa

Conflicts:
	app/aid/its.tex
Merge branch 'master' of github.com:ajholanda/psa