list of things to change for a new project
Merge ../labibi
fixed page template to include correct google analytics ID
Added .sh into gitignore
remove edit me link
Merge branch 'Metagenome' of https://github.com/SherineAwad/khmer-protocols
minor fixes
Merge branch 'master' of github.com:ged-lab/khmer-protocols into metagenome-ctb

Conflicts:
	metagenomics/1-quality.txt
	metagenomics/2-diginorm.txt
Merge pull request #3 from ged-lab/metagenome-ctb

once again we try to merge with latest master