adding fallback background color
adding background color and resolving merge conflicts
Merge pull request #8 from Fit-Genie/stopwatch

Stopwatch
fixing index
adding images to grunt file
created working stopwatch
removing console.log
Merge branch 'stopwatch' of github.com:Fit-Genie/fit-genie-site into stopwatch
modified timer so that it removes first name in array
Merge branch 'stopwatch' of https://github.com/Fit-Genie/fit-genie-site into stopwatch
add SCSS updates and happiness-level.png
adding congrats page and controller
adding call to congrats controller in app.js
Merge pull request #9 from Fit-Genie/templates

Templates
add html to congrats view
Merge pull request #10 from Fit-Genie/congrats-html

add html to congrats view
fixed typo of congratscontroller
Fixed Merge Conflicts