formatting less file
Merge branch 'master' of github.com:GJST-Capstone/Capstone-Project
adding logo size fix
Merge pull request #48 from GJST-Capstone/stacy

add warmup and cooldown videos data and template
fixing focus state for btns
Merge branch 'master' of github.com:GJST-Capstone/Capstone-Project
adding chosen form and merge fix
fixing merge issue
changing rain day text
Merge branch 'master' into stacy