Merge pull request #1 from jackdreilly/master

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

Conflicts:
	article.aux
	article.log
	article.pdf
	article.synctex.gz
	article.tex
	article.toc
Multi objective and Pareto front
Added readme file
git ignore updates