asd
Merge branch 'master' of https://github.com/SjurdurS/CalendarSystem
changed layotu on the access control matrix
Merge branch 'master' of https://github.com/SjurdurS/CalendarSystem

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