Basic bootstrap navbar, template update
Merge branch 'master' of github.com:skleung/locu-tinder

Conflicts:
	templates/index.html