1
Merge branch 'master' of https://github.com/isannn/spa_angular

Conflicts:
	qwe.txt