aide uspeh :D
marto commit
opa
asdsad
coommmmm
Merge branch 'master' of https://github.com/gvasilevaa/weather_center

Conflicts:
	admin_form.css
	emp_activities.js
	employee_form.php
	graphdrawing.js
	update_data.php
	update_data_day.php