added note
fixed merged conflict
Merge branch 'master' of https://github.com/carolinelongtin/swc_collab
moar weirdness