ha
Merge branch 'master' of github.com:semartin/smartAmericaArticle

Conflicts:
	article.aux
	article.log
	article.pdf
	article.synctex.gz
	article.tex
	article.toc