converting some px to em in the styles
Merge branch 'develop' of github.com:web2project/web2project into develop