resolve conflict
get on the same page as master
Merge branch 'master' of github.com:tiy-chs-q4-fee/CLR
Merge pull request #9 from crotten/creatingHomePage

Thanks for fixing the main.js file back
 changing css
added jquery to insert date onto homepage
Merge pull request #10 from rphuber/dateFunctionJavascript

Thank you for fixing this!
:wq
Merge branch 'master' of github.com:tiy-chs-q4-fee/CLR into creatingHomePage
added the jquery to update the quote into the text field
Merge branch 'master' of github.com:tiy-chs-q4-fee/CLR into dateFunctionJavascript
Merge pull request #11 from rphuber/dateFunctionJavascript

Awesome!
small changes
merge changes
 changing css
 changing css
 changing css
 changing css
updated textbox css
Working on the transitions