Merge branch 'master' of C:\Users\Emmanuel\Documents\JoborNot\FrontEnd with conflicts.
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of C:\Users\Emmanuel\Documents\JoborNot\FrontEnd with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Frontend2/css/main.css
	Frontend2/img/Buttons/NavBar_Home_Off.png
	Frontend2/router.html
Landingpage