Initialization
Merge branch 'master' of https://github.com/great-bear/bear-chinook

Conflicts:
	.idea/workspace.xml