Merge pull request #1 from AlexeyMalyshkin/master

qweeq
pewmwegw
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
Merge pull request #3 from 777Eternal777/master

Merging with monkey.