Initial physics for present
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea-templates/workspace.xml