aa
aa
aa
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
aa
Merge pull request #4 from Ivolian/master

12313