updated html
fixed conflicts
update to html
deleted depreciated clean_mysqlite
repalced clean_sqlite from upstream repo
updates to html, urls.py
Merged with rachel's files