stylesheet deleted
Merge branch 'master' of github.com:DanBlack13/CalerWebsite
fixing everything but text to 80 columns becuase we are champions
bouch
Merge branch 'Dan' of github.com:RenderTeam/CalerWebsite into Dan
adding cool kitten stuff
Merge branch 'amet'
prepairing to merge
repairing
repairing & cleaning
Merge branch 'master' of github.com:RenderTeam/CalerWebsite
Revert "repairing & cleaning"

This reverts commit 3b488fe280d0ffdad7002393450a70dab28e31c4.
Revert "Services tab finished"

This reverts commit 0d948d4348dd31c5b2fd3476f1abb7d064cc8dd1.
Merge branch 'Dan'
Merge branch 'Dan'
repair
Merge branch 'master' of github.com:RenderTeam/CalerWebsite
almost done