First upload of files
Merge https://github.com/popwar2/econ