no message
Merge branch 'master' of https://github.com/tatalala/Thirsty

Conflicts:
	navbar.html
Fixed font issue on signup and login button.