Sneaky merge of .gitignore.
Sneaky merge of the thesis.
Sneaky merge of presentation.