start feature
Merge branch 'feature/mah-navbar' of github.com:romain-grelet/bamboo-project into feature/mah-cardPage

Conflicts:
	app/templates/user/home.html.twig
Fix error in merge
CSS for navbar
CSS for navbar
Change typo
Merge branch 'develop' of github.com:romain-grelet/bamboo-project into feature/mah-cardPage

Conflicts:
	app/templates/project/project.html.twig
	app/templates/user/home.html.twig
Merge branch 'develop' of github.com:romain-grelet/bamboo-project into feature/mah-cardPage

Conflicts:
	app/templates/project/project.html.twig
put form in sidebar
try to fix form in sidebar
Merge branch 'develop' of github.com:romain-grelet/bamboo-project into feature/mah-cardPage

Conflicts:
	app/templates/project/project.html.twig
	app/www/assets/styles/style.css
Fix side bar and nav bar
Create layout, put color to task card, fix navbar issue
Merge branch 'develop' of github.com:romain-grelet/bamboo-project into feature/beg-formsFront
Change title
Put button logout
finish feature forms design
Merge branch 'develop' of github.com:romain-grelet/bamboo-project into feature/beg-formsFront
Merge branch 'feature/mah-cardPage' of github.com:romain-grelet/bamboo-project into feature/beg-formsFront

Conflicts:
	app/templates/project/project.html.twig
Feature finish