navbar
merge of branches, commit all changes on heroku tu development