Init assignment 6
Merge remote-tracking branch 'upstream/master'
assignment 6, first paragraph
assignment 6: section 2 done
assignment 6: added last paragraph and conclusion
assignment 7 init
assignment 7: first paragraphs
assignment 7: final edits
Merge remote-tracking branch 'upstream/master'
Merge pull request #213 from tomnar/master

Assignment 6 + 7