deleted temp files
Merge branch 'master' into dataviz
current progress
add python 2 template file