start work
upd site
upd site
Merge branch 'newsite'

Conflicts:
	.gitignore