resize logo and change style
Merge branch 'master' of https://github.com/MarSamm/MPC-web

Conflicts:
	main.css
Merge branch 'master' of https://github.com/MarSamm/MPC-web