merging master
Merge branch 'master' into pats
added if logged in to contribute on project show
Merge branch 'pats'
pushing to let eric have my changes