navbar bug issues 2.0
Merge branch 'master' of https://github.com/tatalala/Thirsty

Conflicts:
	events.html