Added activity descriptions to Notes.
Fixed confilict in SingleWord.java
Fixed conflict with SingleWord.java again.
 Please enter the commit message for your changes. Lines starting
Merge branch 'beach_branch'