Merge branch 'master' of
https://github.com/marciomribeiro/Computers-and-Education

Conflicts:
	elsarticle-template.blg
	elsarticle-template.log
	elsarticle-template.out
	elsarticle-template.pdf
	elsarticle-template.synctex
	sections/strategy.tex