nav bar same
merge conflct fixed
Merge branch 'master' of https://github.com/Wolniewicz/RP-Hackathons