modified:   tw2.jqueryFileTree.egg-info/SOURCES.txt
	modified:   tw2/jqueryFileTree/templates/filetree.mak
Merge branch 'master' of github.com:RobertSudwarts/tw2.jqueryFileTree

Conflicts:
	tw2.jqueryFileTree.egg-info/SOURCES.txt
	tw2/jqueryFileTree/templates/filetree.mak

	modified:   tw2.jqueryFileTree.egg-info/SOURCES.txt
	modified:   tw2/jqueryFileTree/templates/filetree.mak