Merge pull request #29 from KevinFXue/kformiteration1

Kforminteration1
Merge pull request #30 from KevinFXue/general

General
Merge pull request #31 from KevinFXue/kformiteration2

Kformiteration2
Added header to layout
adds preset button feature
merge conflicts
Merge branch 'jtodobuttons'
changes to html buttons
preset buttons fill daily calendar
adds css for week view page
Merge pull request #32 from KevinFXue/sheader

Added header to layout
Merge branch 'master' of https://github.com/KevinFXue/Weekly into jpresetbuttons
Merge pull request #34 from KevinFXue/jpresetbuttons

Jpresetbuttons
Merge branch 'jcss'
merge
merge conflicts
merge fixes