delete contents of data folder, edit some stuff
merge
Merge branch 'davidcrosby-master'