deleted:    "Icon\r"
	modified:   hh_description.txt
Merge remote-tracking branch 'origin/master' into jon
fix
-a delete
Merge branch 'tom' of https://github.com/puruckertom/ubertool_src into tom
deleting icon again
playing
Merge branch 'tom' of https://github.com/puruckertom/ubertool_src into tom
delete keys
Merge branch 'tom' of https://github.com/puruckertom/ubertool_src into tom
Merge remote-tracking branch 'origin/master' into marcia
Delete key files
Update GenericJon Test
test2
Merge remote-tracking branch 'origin/master' into jon
Merge remote-tracking branch 'origin/master' into marcia
update przm
del pfam-jQuery
add pfam-jquery
update readme