changed breakpoints sitewide
Merge upstream master

Conflicts:
	css/style.css