modified .gitignore
Incorporated Danny's feedback
Merge branch 'master' of github.com:altern/COPEweb
resolved conflict
Merge branch 'master' of github.com:altern/COPEweb
Added link to Michael's page