solution
changes
made subdir
Add 'wfxml/' from commit '3639bfb514ae71448fe7522e48656a82254cdd68'

git-subtree-dir: wfxml
git-subtree-mainline: 08f5d19712665f3a88751bad3748a7340dddb765
git-subtree-split: 3639bfb514ae71448fe7522e48656a82254cdd68
Add 'xpathdemo/' from commit '7ed96910cf5aa28dc494e9e8e472b6f1fa540222'

git-subtree-dir: xpathdemo
git-subtree-mainline: f1b843e37339502f7e441a52ef75644a9a5a92fc
git-subtree-split: 7ed96910cf5aa28dc494e9e8e472b6f1fa540222
Merge branch 'master' into solution

Conflicts:
	css/project.css
	wfxml/bathe_cat.xml
	wfxml/hits.xml
reading XML
ignore patterns updated
Merge commit '55c27b8ebc95509dc0cb52673f022fe63675af32'
Merge commit '2883632b3702cab76c6356ad143fe644f8c47e97'