Update
Merge branch 'Alternate-Meta-Queries' of https://github.com/ericfrisino/wp-idn-theme into Alternate-Meta-Queries

Conflicts:
	style.css