updates media queries
Merge branch 'master' of github.com:andrewmyhre/andrewmyhre2013

Conflicts:
	andrewmyhre.com.web/am.css