Styling updates
Merge branch 'development' of https://github.com/TeamFit/web-app into development
Rename main.html to welcome.html