Luis Chaves
moved things around, cleaned up files, final debug of dokcerfile
70b960d