asdasd
Merge branch 'master' of https://github.com/SjurdurS/CalendarSystem

Conflicts:
	LaTeX/SDDny/Main.hst
	LaTeX/SDDny/Main.pdf
	LaTeX/SDDny/Main.synctex.gz
	LaTeX/SDDny/Main.ver