Quickfix Html and Scss

- Cleaned up the html and took out un-nessicary div
Merge branch and merge conflict

- Fixed merge conflicts
- Merge branch 'HTML/SCSS' to Master