Removed the .txt file since there is a .tex file instead.
Had to commit because of a conflict.
Merge branch 'master' of github.com:Kiiwi/AST2210