resolve conflict
get on the same page as master
Merge branch 'master' of github.com:tiy-chs-q4-fee/CLR
 changing css
 changing css
 changing css
 changing css
 changing css
updated textbox css
Trying to get up to date with group master