Modified main.py, added /templates/timer.html
Merge branch 'pallavi' into sarah
Added bootstrap to external folder