adds watchposition
fixes conflicts
Merge pull request #6 from jhath16/justin-branch

Justin branch
adds buttons
Merge pull request #7 from jhath16/justin-branch

adds buttons
adds timer styling
fixes issues
template
redo
Merge pull request #8 from jgoley/skylar_branch

redo
adds Styles
adds styles
Merge pull request #9 from jgoley/a-branch

A branch
adds header
Merge pull request #10 from jgoley/a-branch

adds header
adds registration page
polishes sign up page
polishes header
Merge branch 'jhath16-justin-branch'