10 days
Merge branch 'master' of https://github.com/gvasilevaa/weather_center

Conflicts:
	emp_activities.js
	graphdrawing.js
	main-page.css
	weather.php