Began advanced snake
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit e0415abfea3c528afca81cdeb74e447aafc7ac50.