Fixing rendering issue in Firefox.
Merge pull request #60 from davivcgarcia/master

Fixing navbar rendering issue on Firefox.
Merge pull request #2 from crosbymichael/master

Merge latest
Merge branch 'master' into bootstrap-update

Conflicts:
	assets/css/app.css