qwe
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
	styles/footer.less
	styles/main.css
	styles/main.less
Merge remote-tracking branch 'origin/master'

Conflicts:
	styles/main.css
development