~ Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/css/styles.css
Merge branch 'master' of https://github.com/bluecloudy/Critical-Map
~ Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/components/home-page/home.html
	src/components/list-locations/list-locations.js
~ Commit