media queries for different size, desktop, tablet,movie
Merge branch 'master' of https://github.com/MarvinApp/marvinapp.github.io

Conflicts:
	css/main.css
	css/main.less
	js/main.js