Tyrone prompted for merge on a large pull from kyle, mostly css in question
Tyrone merges the css conflicts and pushes back to keep repo current