Merge pull request #2 from GJST-Capstone/gregory

adding new change to the project for tutorial
I added a Tristan less file
Merge pull request #3 from GJST-Capstone/Tristan

I added a Tristan less file
BAckground is blue
background blue
adding change to show merge conflict
fixing merge conflict