removed html files from views/
ejs'd some files and added (hopefully) needed routing updates. untested.
merge
merge