updates
Merge branch 'master' of https://github.com/driftyco/starter-navtest

Conflicts:
	js/app.js
	tab-first-child.html
	tab-first.html
	tab-second-child.html
	tab-second-grandchild.html
	tab-second.html
update