- adding media queries for desktop
Merge branch 'master' of https://github.com/element4git/pluggedin

Conflicts:
	css/global.css
Merge branch 'pluggedin_live' of https://github.com/element4git/pluggedin