Setting up basic file structure for WPF Assignment directories
Changes to workspace.xml file 11 differences
Merge remote-tracking branch 'origin/master' into working_branch

Conflicts:
	.idea/codeStyleSettings.xml

renamed and moved expressions and conditionals files into main directory
Merge remote-tracking branch 'origin/master' into working_branch

Conflicts:
	.idea/codeStyleSettings.xml

renamed and moved expressions and conditionals files into main directory