left win
Merge branch 'master' of https://github.com/mimega/project1

Conflicts:
	first.txt