rm extra file
Merge branch 'working'
updated to latest