Last version: done at work
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	css/Task5-style.css
	index.html
	js/Task5-executive.js
	temp.txt