Updates for basic styles and front end routing!
Merge remote-tracking branch 'origin/master'