fudge
fudge
fudge
fudge
Merge branch 'master' of github.com:WarwickPARSE/parse-client

Conflicts:
	PARSE/CoreLoader.xaml.cs