1
Merge branch 'view' of https://github.com/shadowlaidback/fadeev into view

Conflicts:
	123.txt
Merge branch 'view' of https://github.com/shadowlaidback/fadeev into view

Conflicts:
	123.txt