css
Merge branch 'master' of github.com:tiy-chs-q4-fee/CLR into creatingHomePage
Merge branch 'master' of github.com:tiy-chs-q4-fee/CLR into creatingHomePage
styling content page
Merge branch 'master' of github.com:tiy-chs-q4-fee/CLR into creatingHomePage
Updated last file
Merge pull request #26 from rphuber/dateFunctionJavascript

Date function javascript
Merge pull request #25 from lizkline91/lizBranchTextBox

Updated last file
switched the home button out
pulled from upstream and fixed conflicts
Merge pull request #27 from crotten/creatingHomePage

added some icons
updated functions
Merge branch 'master' of github.com:tiy-chs-q4-fee/CLR into dateFunctionJavascript
added additional icons to the iconfonts