changed timer.html
rm logo.jpg
added teacher page and other minor bootstrap changes
removed teacher page
added settings.html
Merge pull request #1 from stuycs-ml7-projects/sarah

Sarah