fixed new trigger increment thing not being centered
Merge branch 'master' of https://github.com/danisaurus/shift-api into more-form-styling
Styled triggers table on settings tab
merging
scrapped weekly report; just grabs everything now
Merge pull request #56 from danisaurus/charts-fix

Charts fix
fixing the wheel of feels
Merge branch 'master' into supporters
Merge pull request #57 from danisaurus/life-aquatic-themed-trigger-table

Life aquatic themed trigger table
merging with master