timeline
Merge branch 'master' of https://github.com/Adam27/volia_last

Conflicts:
	fire_app_log.txt
Merge branch 'master' of https://github.com/Adam27/volia_last

Conflicts:
	fire_app_log.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	fire_app_log.txt
test