Added splash image
Merge branch 'master' of github.com:jchristianhall/vigor into login

Updating branch with master
Merge branch 'badges-tab', remote-tracking branch 'origin' into badges-tab
Added login markup...to the wrong branch because I'm dumb
Stripped out some ids
Merge branch 'master' of github.com:jchristianhall/vigor into login

Updating branch with master
Added styling for login
Merge branch 'login'
Merge pull request #4 from jchristianhall/login

Login
Merge branch 'master' of github.com:jchristianhall/vigor

Master merge
Changed history markup to use badges classes
Merge branch 'master' of github.com:jchristianhall/vigor into badges-tab

Updating with master
Badges adjustments
Merge branch 'badges-tab'

Master merge
Merge pull request #6 from jchristianhall/exercise-tab

Exercise tab
Merge branch 'master' of github.com:jchristianhall/vigor

PLEASE MERGE
Making today show by default
Access to add exercise added to exercise tab
Finishing up Chart.js stuff
Master merge and finishing chart stuff