added html files
deleted useless apps
pyc
let's try to get this merge going
Added HTML files, edited views
I think I fixed mymerge
Merge branch 'master' of github.com:lprader/SportsCohorts into ale_branch