Update some of the wording
working on assets
Fixing assets
converting to sass
merging master