full year media query

asdf
asdf

asdf
Merge branch 'master' of https://github.com/jalford14/intern-website

Conflicts:
	css/main.css