homePage
Merge branch 'master' of https://github.com/holdera/HealthApp

Conflicts:
	Symfony/.idea/workspace.xml
	Symfony/app/cache/dev/classes.map
	Symfony/app/cache/dev/classes.php.meta

Symfony/app/cache/dev/twig/c0/60/5da27a419bf2b816a9e51e0b736931cbf533a64
223c35e8f1b9aa3b7566f.php

Symfony/app/cache/dev/twig/c5/2e/fac5e1bde94013ff53046b678fd0103a8c136a0
42d2c4f2ef915ea57e452.php

Symfony/app/cache/dev/twig/ec/c0/6c52fac88b6c39388f798d9cce1f1f9d7ef0c5d
79fab8ba95c1c5375608e.php
	Symfony/app/config/security.yml
	Symfony/app/logs/dev.log
	Symfony/app/logs/prod.log