any updates done since the last pull
any updates done since the last pull
Merge branch 'master' of https://github.com/foxydot/thredheads

Conflicts:
	wp-content/plugins/jetpack/_inc/jetpack-icons/font/jetpack.eot
	wp-content/plugins/jetpack/_inc/jetpack-icons/font/jetpack.svg
	wp-content/plugins/jetpack/_inc/jetpack-icons/font/jetpack.ttf
	wp-content/plugins/jetpack/_inc/jetpack-icons/font/jetpack.woff