deleting text.html
Merge branches 'clean_up' and 'master'