??????? (+2 squashed commit)

Squashed commit:

[e79acea] ?????

[0d53986] ?????
Merge branch 'static_change'

Conflicts:
	.gitignore