Desktop version
Merge branch 'master' of https://github.com/n-lawrence/b

Conflicts:
	techstar_Dev111/techstar/assets/js/responsive-nav.js