Merge branch 'master' of github.com:meganap/qiime_web_app into agut
Merge branch 'master' of github.com:meganap/qiime_web_app into agut
Checking in new icons
checking in more icons
Merge pull request #166 from meganap/agut

adding new icons
adding udpates to menu and add sample pages
Merge pull request #167 from douginator2000/agut

adding udpates to menu and add sample pages