Testing remote push conflict
Merge branch 'master' of https://github.com/kmamykin/gitclass

Conflicts:
	AlleyNYC.md