changed folder
Merge branch 'master' of https://github.com/anvar-sagutdinov/smartexe

Conflicts:
	www/images/about_us/about_us_header_image.png
changed