New project: Recipe
Recipe: notes
New project: Comic
Recipe: added title to notes
Comic: notes
Comic: resources
New project: Cups and balls
Cups: notes
Fixed conflicted manifest file
Merge branch 'matteomenapace-master'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.