font styling
font styling
resolved merge conflicts
Merge pull request #32 from DriftingWave/testing_mvp

Testing mvp