%DIF 1c1
%DIF LATEXDIFF DIFFERENCE FILE
%DIF DEL ./FresherGuide2018Combined.tex         Thu Nov 28 18:48:31 2019
%DIF ADD ../FresherGuide2020/FresherGuide.tex   Thu Nov 28 16:54:26 2019
%DIF < % HERE BE DRAGONS
%DIF -------
\documentclass[a5paper,10pt,openany]{scrreprt} %DIF >
%DIF -------

%DIF 3c3-5
%DIF < % This is a compilation based of the 2014 UCC Fresher Guide.
%DIF -------
\usepackage[hidelinks]{hyperref} %DIF >
\usepackage[dvipsnames,svgnames,table,hyperref]{xcolor} %DIF >
\renewcommand{\UrlFont}{\ttfamily\small} %DIF >
%DIF -------

%DIF 5-6c7
%DIF < % This is complicated because it is based on [SZM]'s 2012 Honours Thesis template, which in turn was based on a template written by a Physics Professor.
%DIF < % ~50% of this isn't actually needed, but it's too much effort to clean it up.
%DIF -------
\usepackage[a-2b]{pdfx} %DIF >
%DIF -------

%DIF 8-25d9
%DIF < \documentclass[a5paper,10pt,openany]{extreport}
%DIF < \usepackage[margin=0.75in,headsep=0.25in,footskip=0.25in]{geometry}
%DIF < \renewcommand{\familydefault}{\sfdefault}
%DIF < %\renewcommand{\familydefault}{\ttdefault}
%DIF < %\linespread{1.3}
%DIF < %\usepackage{setspace}
%DIF < %\onehalfspacing
%DIF < \parskip 8pt           % sets spacing between paragraphs
%DIF < %\renewcommand{\baselinestretch}{1.5} 	% Uncomment for 1.5 spacing between lines
%DIF < %\parindent 0pt		  % sets leading space for paragraphs
%DIF <
%DIF < \usepackage{anyfontsize}
%DIF <
%DIF < \usepackage{mdframed}
%DIF < \usepackage{tocloft}
%DIF <
%DIF < %\usepackage{natbib}
%DIF < \usepackage{makeidx}
%DIF -------
\usepackage{graphicx}
%DIF 27-36c10-12
%DIF < \usepackage{caption}
%DIF < %\usepackage{subfigure}
%DIF < \usepackage{rotating}
%DIF < %\usepackage{lscape}
%DIF < \usepackage{pdflscape} % Needed for landscaping - in pdf viewer
%DIF < \usepackage{verbatim}
%DIF < \usepackage{amsmath, amsthm,amssymb}
%DIF < \usepackage{mathrsfs}
%DIF < \usepackage{hyperref}
%DIF < \usepackage{multirow}
%DIF -------
\usepackage{svg} %DIF >
\usepackage[left=2cm,right=2cm,top=1.5cm,bottom=2cm]{geometry} %DIF >
\usepackage{multicol} %DIF >
%DIF -------

%DIF 38-121d14
%DIF < \usepackage[utf8]{inputenc}
%DIF < \usepackage[english]{babel}
%DIF < \usepackage{epstopdf}
%DIF < \usepackage{float}
%DIF < % \usepackage[compact]{titlesec}
%DIF < % \titlespacing{\chapter}{0pt}{-50pt}{0pt}
%DIF < % % spacing glue: how to read {12pt plus 4pt minus 2pt}
%DIF < % %           12pt is what we would like the spacing to be
%DIF < % %           plus 4pt means that TeX can stretch it by at most 4pt
%DIF < % %           minus 2pt means that TeX can shrink it by at most 2pt
%DIF < % \titlespacing\section{0pt}{0pt plus 0pt minus 14pt}{0pt plus 0pt minus 14pt}
%DIF < % \titleformat{\chapter}
%DIF < % {\normalfont\LARGE\bfseries}{\thechapter.}{1em}{}
%DIF <
%DIF < %\usepackage[usenames,dvipsnames]{color}
%DIF < %\usepackage{listings} % For code snippets
%DIF < \definecolor{pink}{rgb}{1.0,0.5,0.5}
%DIF < \definecolor{darkgray}{rgb}{0.1,0.1,0.1}
%DIF < \definecolor{lightgray}{rgb}{0.95,0.95,0.95}
%DIF < \definecolor{gray}{rgb}{0.5,0.5,0.5}
%DIF < \definecolor{darkred}{rgb}{0.75,0,0}
%DIF < \definecolor{darkblue}{rgb}{0,0,0.35}
%DIF < \definecolor{green}{rgb}{0,0.70,0}
%DIF < \definecolor{black}{rgb}{0,0,0}
%DIF < %\lstset{language=Java}
%DIF < %\lstset{backgroundcolor=\color{darkgray}}
%DIF < %\lstset{numbers=left, numberstyle=\tiny, stepnumber=1, numbersep=5pt}
%DIF < %\lstset{keywordstyle=\color{darkred}\bfseries}
%DIF < %\lstset{commentstyle=\color{darkblue}}
%DIF < %\lstset{stringsyle=\color{red}}
%DIF < %\lstset{showstringspaces=false}
%DIF < %\lstset{basicstyle=\small}
%DIF <
%DIF <
%DIF < \usepackage[table]{xcolor}
%DIF <
%DIF < \newtheorem{theorem}{Theorem}[section]
%DIF < \newtheorem{lemma}[theorem]{Lemma}
%DIF < \theoremstyle{definition}\newtheorem{definition}[theorem]{Definition}
%DIF < \newtheorem{proposition}[theorem]{Proposition}
%DIF < \newtheorem{corollary}[theorem]{Corollary}
%DIF < \newtheorem{example}{Example}
%DIF < \theoremstyle{remark}\newtheorem*{remark}{Remark}
%DIF <
%DIF < \newcommand{\Phid}[0]{\dot{\Phi}}
%DIF < \newcommand{\Phib}[0]{\bar{\Phi}}
%DIF <
%DIF < \newcommand{\de}[0]{\delta}
%DIF < \newcommand{\deb}[0]{\bar{\delta}}
%DIF <
%DIF < \newcommand{\that}[0]{\hat{\theta}}
%DIF <
%DIF < \newcommand{\vect}[1]{\boldsymbol{#1}} % Draw a vector
%DIF < \newcommand{\divg}[1]{\nabla \cdot #1} % divergence
%DIF < \newcommand{\curl}[1]{\nabla \times #1} % curl
%DIF < \newcommand{\grad}[1]{\nabla #1} %gradient
%DIF < \newcommand{\pd}[3][ ]{\frac{\partial^{#1} #2}{\partial #3^{#1}}} %partial derivative
%DIF < \newcommand{\der}[3][ ]{\frac{d^{#1} #2}{d #3^{#1}}} %full derivative
%DIF < \newcommand{\phasor}[1]{\tilde{#1}} % make a phasor
%DIF < \newcommand{\laplacian}[1]{\nabla^2 {#1}} % The laplacian operator
%DIF <
%DIF <
%DIF <
%DIF < % Reference things in GitHub
%DIF < \newcommand{\gitref}[2]{\href{https://github.com/UniversityComputerClub/FresherGuide/master/#1/#2}{  \textcolor{black}{\emph{#2}}}}
%DIF < % Refer to API commands
%DIF < \newcommand{\api}[1]{  ``\textcolor{black}{\texttt{/api/#1}}''}
%DIF < % Pun alert
%DIF < \newcommand{\pun}[1]{#1} % Emphasising it is kind of unnecessary
%DIF < % Shell command
%DIF < \newcommand{\shell}[1]{\texttt{#1}}
%DIF < \newcommand{\server}[1]{\texttt{#1}}
%DIF < % Rants
%DIF < \newcommand{\rant}[1]{\textsc{#1}}
%DIF < % URL
%DIF < \renewcommand{\url}[1]{<\href{#1}{\underline{\color{blue}{#1}}}>}
%DIF <
%DIF < % Reference things.
%DIF < \newcommand{\figref}[1]{(Figure \ref{#1})}
%DIF < \newcommand{\seeref}[1]{(See \ref{#1})}
%DIF <
%DIF < \newcommand{\setfont}[1]{\fontfamily{#1}\selectfont}
%DIF <
%DIF < % To make underscores printable without escaping them
%DIF -------
\usepackage[T1]{fontenc}
%DIF 123c15-20
%DIF < \catcode`\_=12
%DIF -------
\usepackage{sourcecodepro} %DIF >
\usepackage{sourceserifpro} %DIF >
\usepackage[default]{sourcesanspro} %DIF >
\usepackage[activate={true,nocompatibility},final,tracking=true,kerning=true,spacing=true,factor=2000]{microtype}
%DIF >
\newcommand{\acr}[1]{\textls*[70]{\scshape \MakeLowercase{#1}}} %DIF >
\usepackage{setspace} %DIF >
%DIF -------

%DIF 125-129c22-23
%DIF < % Refer to code (can change each one as needed)
%DIF < \newcommand{\funct}[1]{  \texttt{#1}}
%DIF < \newcommand{\var}[1]{  \texttt{#1}}
%DIF < \newcommand{\type}[1]{  \texttt{#1}}
%DIF < \newcommand{\code}[1]{  \texttt{#1}}
%DIF -------
\usepackage{booktabs} %DIF >
\usepackage{tocloft} %DIF >
%DIF -------

%DIF 131a25
\usepackage[many]{tcolorbox} %DIF >
%DIF -------

%DIF 132-140c27-34
%DIF < %\usepackage{endfloat}
%DIF < %\nomarkersintext
%DIF < %\pagestyle{plain}
%DIF < %\topmargin -0.6true in
%DIF < %\textwidth 15true cm
%DIF < %\textheight 9.5true in
%DIF < %\oddsidemargin 0.25true in
%DIF < %\evensidemargin 0.25true in
%DIF < %\headsep 0.4true in
%DIF -------
\DeclareTotalTCBox{\shell}{v}{ %DIF >
    nobeforeafter,tcbox raise base, %DIF >
    enhanced, frame hidden, arc=3pt, %DIF >
    boxsep=0pt,left=3pt,right=3pt,top=2pt,bottom=2pt, % minimal margin/paddding
%DIF >
    colback=black!7!white, %DIF >
    outer arc=0pt, %DIF >
    leftrule=0pt,rightrule=0pt,toprule=0pt,bottomrule=0pt %DIF >
}{{\ttfamily \small #1}} %DIF >
%DIF -------

%DIF <
%DIF -------
\parskip 8pt %DIF >
%DIF < \usepackage{fancyheadings}
\parindent 0pt %DIF >
%DIF < \pagestyle{fancy}
%DIF < \addtolength{\headheight}{2.5pt}
%DIF < \renewcommand{\chaptermark}[1]{\markboth{\thechapter~~#1}{}}
%DIF < \renewcommand{\sectionmark}[1]{\markright{\thesection~~#1}{}}
%DIF < \ifthenelse{\boolean{@twoside}}
%DIF < {
%DIF < 	\rhead[\bfseries \rightmark]{\bfseries \thepage}
%DIF < 	\lhead[\bfseries \leftmark]{\bfseries \thepage}
%DIF < 	\addtolength{\headwidth}{\marginparsep}
%DIF < 	\addtolength{\headwidth}{\marginparwidth}
%DIF < }{
%DIF < 	\lhead{\bfseries \leftmark}
%DIF < 	\rhead{\bfseries \thepage}
%DIF < }
%DIF < \cfoot{}
%DIF <
%DIF < \usepackage{etoolbox}
%DIF < \makeatletter
%DIF < \patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}{}
%DIF < \makeatother
%DIF <
%DIF < \newcommand{\zchapter}[1]{\chapter{#1} \setcounter{section}{-1}}
%DIF <
%DIF < \usepackage{tocloft}
%DIF < \renewcommand\cftchapfont{\small\bfseries}
%DIF < \renewcommand\cftsecfont{\small}
%DIF <
%DIF < \renewcommand\cftchappagefont{\small\bfseries}
%DIF < \renewcommand\cftsecpagefont{\small}
%DIF < %---------------------------------------------------------
%DIF < %---------------------------------------------------------
%DIF PREAMBLE EXTENSION ADDED BY LATEXDIFF
%DIF UNDERLINE PREAMBLE %DIF PREAMBLE
\RequirePackage[normalem]{ulem} %DIF PREAMBLE
\RequirePackage{color}\definecolor{RED}{rgb}{1,0,0}\definecolor{BLUE}{rgb}{0,0,1} %DIF PREAMBLE
\providecommand{\DIFaddtex}[1]{{\protect\color{blue}\uwave{#1}}} %DIF PREAMBLE
\providecommand{\DIFdeltex}[1]{{\protect\color{red}\sout{#1}}}                      %DIF PREAMBLE
%DIF SAFE PREAMBLE %DIF PREAMBLE
\providecommand{\DIFaddbegin}{} %DIF PREAMBLE
\providecommand{\DIFaddend}{} %DIF PREAMBLE
\providecommand{\DIFdelbegin}{} %DIF PREAMBLE
\providecommand{\DIFdelend}{} %DIF PREAMBLE
%DIF FLOATSAFE PREAMBLE %DIF PREAMBLE
\providecommand{\DIFaddFL}[1]{\DIFadd{#1}} %DIF PREAMBLE
\providecommand{\DIFdelFL}[1]{\DIFdel{#1}} %DIF PREAMBLE
\providecommand{\DIFaddbeginFL}{} %DIF PREAMBLE
\providecommand{\DIFaddendFL}{} %DIF PREAMBLE
\providecommand{\DIFdelbeginFL}{} %DIF PREAMBLE
\providecommand{\DIFdelendFL}{} %DIF PREAMBLE
%DIF HYPERREF PREAMBLE %DIF PREAMBLE
\providecommand{\DIFadd}[1]{\texorpdfstring{\DIFaddtex{#1}}{#1}} %DIF PREAMBLE
\providecommand{\DIFdel}[1]{\texorpdfstring{\DIFdeltex{#1}}{}} %DIF PREAMBLE
\newcommand{\DIFscaledelfig}{0.5}
%DIF HIGHLIGHTGRAPHICS PREAMBLE %DIF PREAMBLE
\RequirePackage{settobox} %DIF PREAMBLE
\RequirePackage{letltxmacro} %DIF PREAMBLE
\newsavebox{\DIFdelgraphicsbox} %DIF PREAMBLE
\newlength{\DIFdelgraphicswidth} %DIF PREAMBLE
\newlength{\DIFdelgraphicsheight} %DIF PREAMBLE
% store original definition of \includegraphics %DIF PREAMBLE
\LetLtxMacro{\DIFOincludegraphics}{\includegraphics} %DIF PREAMBLE
\newcommand{\DIFaddincludegraphics}[2][]{{\color{blue}\fbox{\DIFOincludegraphics[#1]{#2}}}} %DIF PREAMBLE
\newcommand{\DIFdelincludegraphics}[2][]{% %DIF PREAMBLE
\sbox{\DIFdelgraphicsbox}{\DIFOincludegraphics[#1]{#2}}% %DIF PREAMBLE
\settoboxwidth{\DIFdelgraphicswidth}{\DIFdelgraphicsbox} %DIF PREAMBLE
\settoboxtotalheight{\DIFdelgraphicsheight}{\DIFdelgraphicsbox} %DIF PREAMBLE
\scalebox{\DIFscaledelfig}{% %DIF PREAMBLE
\parbox[b]{\DIFdelgraphicswidth}{\usebox{\DIFdelgraphicsbox}\\[-\baselineskip] \rule{\DIFdelgraphicswidth}{0em}}\llap{\resizebox{\DIFdelgraphicswidth}{\DIFdelgraphicsheight}{% %DIF PREAMBLE
\setlength{\unitlength}{\DIFdelgraphicswidth}% %DIF PREAMBLE
\begin{picture}(1,1)% %DIF PREAMBLE
\thicklines\linethickness{2pt} %DIF PREAMBLE
{\color[rgb]{1,0,0}\put(0,0){\framebox(1,1){}}}% %DIF PREAMBLE
{\color[rgb]{1,0,0}\put(0,0){\line( 1,1){1}}}% %DIF PREAMBLE
{\color[rgb]{1,0,0}\put(0,1){\line(1,-1){1}}}% %DIF PREAMBLE
\end{picture}% %DIF PREAMBLE
}\hspace*{3pt}}} %DIF PREAMBLE
} %DIF PREAMBLE
\LetLtxMacro{\DIFOaddbegin}{\DIFaddbegin} %DIF PREAMBLE
\LetLtxMacro{\DIFOaddend}{\DIFaddend} %DIF PREAMBLE
\LetLtxMacro{\DIFOdelbegin}{\DIFdelbegin} %DIF PREAMBLE
\LetLtxMacro{\DIFOdelend}{\DIFdelend} %DIF PREAMBLE
\DeclareRobustCommand{\DIFaddbegin}{\DIFOaddbegin \let\includegraphics\DIFaddincludegraphics} %DIF PREAMBLE
\DeclareRobustCommand{\DIFaddend}{\DIFOaddend \let\includegraphics\DIFOincludegraphics} %DIF PREAMBLE
\DeclareRobustCommand{\DIFdelbegin}{\DIFOdelbegin \let\includegraphics\DIFdelincludegraphics} %DIF PREAMBLE
\DeclareRobustCommand{\DIFdelend}{\DIFOaddend \let\includegraphics\DIFOincludegraphics} %DIF PREAMBLE
\LetLtxMacro{\DIFOaddbeginFL}{\DIFaddbeginFL} %DIF PREAMBLE
\LetLtxMacro{\DIFOaddendFL}{\DIFaddendFL} %DIF PREAMBLE
\LetLtxMacro{\DIFOdelbeginFL}{\DIFdelbeginFL} %DIF PREAMBLE
\LetLtxMacro{\DIFOdelendFL}{\DIFdelendFL} %DIF PREAMBLE
\DeclareRobustCommand{\DIFaddbeginFL}{\DIFOaddbeginFL \let\includegraphics\DIFaddincludegraphics} %DIF PREAMBLE
\DeclareRobustCommand{\DIFaddendFL}{\DIFOaddendFL \let\includegraphics\DIFOincludegraphics} %DIF PREAMBLE
\DeclareRobustCommand{\DIFdelbeginFL}{\DIFOdelbeginFL \let\includegraphics\DIFdelincludegraphics} %DIF PREAMBLE
\DeclareRobustCommand{\DIFdelendFL}{\DIFOaddendFL \let\includegraphics\DIFOincludegraphics} %DIF PREAMBLE
%DIF END PREAMBLE EXTENSION ADDED BY LATEXDIFF

\begin{document}

%DIF <  keeps text within our margins
	\DIFdelbegin %DIFDELCMD < \sloppy%%%
%DIF <  This is who you are
\DIFdelend \DIFaddbegin \thispagestyle{plain}
\begin{titlepage}
    \centering
\DIFaddend

    \DIFdelbegin %DIFDELCMD < \pagenumbering{arabic}
%DIFDELCMD < %%%
\DIFdelend \DIFaddbegin \vspace*{1cm}
\DIFaddend

    %DIF < \pagenumbering{arabic}
	\DIFdelbegin %DIFDELCMD < \renewcommand{\contentsname}{Contents}
%DIFDELCMD < 	%%%
%DIF < ---------------------------------------------------------
	%DIFDELCMD < \setlength{\cftbeforetoctitleskip}{1pt}
%DIFDELCMD < 	%%%
\DIFdelend {\DIFdelbegin %DIFDELCMD < \tiny\tableofcontents%%%
\DIFdelend \DIFaddbegin \huge \DIFadd{UCC}\enspace \DIFadd{\raisebox{1.4pt}{::}}\enspace \DIFadd{A Detailed Guide}\DIFaddend }
%DIF < ---------------------------------------------------------
	%DIF < Include the chapters!

    \DIFdelbegin %DIFDELCMD < \setcounter{chapter}{-1}
%DIFDELCMD < %%%
\DIFdelend \DIFaddbegin \vspace{2cm}
\DIFaddend

    %DIF < \newpage
	%DIF < ---------------------------------------------------------
	%DIF < \renewcommand{\bibname}{References}
	%DIF < \bibliography{references/refs}
	%DIF < \bibliographystyle{ieeetr}
	%DIF < \addcontentsline{toc}{part}{References}
	%DIF < ---------------------------------------------------------
\DIFaddbegin \includesvg[width=0.5\textwidth]{ucc-logo} \\[1cm]
    \url{http://www.ucc.asn.au}
\DIFaddend

    %DIF <  Appendices
	%DIF < \appendix
	%DIF < \include{appendices/Glossary}
	%DIF < \include{appendices/figures}
\DIFdelbegin %DIFDELCMD <

%DIFDELCMD < 	%%%
%DIF < ---------------------------------------------------------
%DIFDELCMD <

%DIFDELCMD < \zchapter{Introduction}
%DIFDELCMD <

%DIFDELCMD < %%%
%DIF <  <person>'s welcome
%DIFDELCMD < \newenvironment{welcome}[3]
%DIFDELCMD < %%%
\DIFdelend \DIFaddbegin \vfill
    \DIFaddend {\DIFdelbegin %DIFDELCMD <

%DIFDELCMD < %%%
%DIF < 	\begin{mdframed}[backgroundcolor=white]
%DIFDELCMD <

%DIFDELCMD < \color{black}{\section{#1's Welcome}}
%DIFDELCMD < \color{black}{\noindent \bfseries Incoming message from #2  <\href{mailto:#3@ucc.asn.au}{#3@ucc.asn.au}>:}
%DIFDELCMD <

%DIFDELCMD < %%%
\DIFdelend \DIFaddbegin \LARGE \DIFadd{2020}\DIFaddend }
    \DIFdelbegin %DIFDELCMD < {}
%DIFDELCMD < %%%
\DIFdelend \DIFaddbegin \vspace{3cm}
\end{titlepage}
\DIFaddend

\DIFdelbegin %DIFDELCMD < \begin{welcome}{President}{Samuel Shenton}{samuel}
%DIFDELCMD < %%%
\DIFdelend \DIFaddbegin \section{\DIFadd{Introduction}}
\DIFaddend

\DIFdelbegin %DIFDELCMD < \noindent %%%
\DIFdel{Welcome to the UCC and our 40th Anniversary Fresher Guide!
}%DIFDELCMD <

%DIFDELCMD < %%%
\DIFdel{UCC has always been a social club for students interested in computers who want to meet new friends, work on projects or play games during breaks.
No technical experience is necessary to join up but if you do want to learn more and get involved with computers be sure to attend our many Tech Talks and Hacking Nights announced on our primary mailing list ucc@.
We also host a bunch of social }\DIFdelend \DIFaddbegin \subsection*{\DIFadd{What is UCC}}

\DIFadd{UCC is a club dedicated to the social and technical side of computers. Founded in
1974, UCC has been the perfect place for anyone with a passion for computers for
more than 40 years. UCC has been an innovator, placing a drink machine on the
internet in 1992, with many of our members going on to achieve great things.
}

\DIFadd{We also have our fair share of gamers, with loads of game-related }\DIFaddend events
throughout the year\DIFdelbegin \DIFdel{such as LANs, the Quiz Night, our Annual Camp in July and Charity Vigil. Be sure to attend the Fresher's Welcome and Annual General Meeting to get the best introduction to the club and run for Fresher Rep, a great first step to becoming involved in the UCC Committee.
}%DIFDELCMD <

%DIFDELCMD < %%%
\DIFdel{The UCC Clubroom has been the focal centre of the club for years.
With numerous clubroom desktops, machine room and our famous Coke and Snack Machines it provides everything you could want on a typical university day.
Recently, some new chairs, keyboards and mice have been purchased to improve
equipment and an Oculus Rift bought for all members to try out, just ask a door member. }%DIFDELCMD <

%DIFDELCMD < %%%
\DIFdel{Founded in 1974, the UCC is one of the oldest student run computer clubs in the world, even older than the Computer Science Department here at UWA.
To celebrate, we are hosting a 40th Anniversary Dinner in September where members old and new will gather to learn and reminisce over our rich history. History which no doubt will be dug up again throughout the year}\DIFdelend . \DIFaddbegin \DIFadd{UCC prides itself on being a place for all sorts of people
with a fondness for computers to hang out. We have many regular events
throughout the year including pizza nights, tech-talks, and many more. Hopefully
this guide provides some insight about the club.
}\DIFaddend

\DIFdelbegin \DIFdel{So make sure you come to the clubroom, set up your account and enhance your university experience at UCC.
}\DIFdelend \DIFaddbegin \subsection*{\DIFadd{President's Welcome}}
\DIFaddend

\DIFdelbegin \DIFdel{Samuel Shenton }%DIFDELCMD < [%%%
\DIFdel{SAS}%DIFDELCMD < ]
%DIFDELCMD < %%%
\DIFdel{UCC President 2013
}%DIFDELCMD < \end{welcome}
%DIFDELCMD < %%%
\DIFdelend \DIFaddbegin \emph{\DIFadd{Hey James, write something here}}
\DIFaddend

%DIF < \pagebreak
\DIFaddbegin \newpage
\begin{spacing}{1.3}
    \setlength\cftparskip{-2pt}
    \setlength\cftbeforesecskip{0pt}
    \tableofcontents
\end{spacing}
\DIFaddend

%DIF < \begin{welcome}{Zanchey}{David Adam}{zanchey}
%DIF < There is no escape! Don't make me destroy you. Fresher, you do not yet realize your importance. You've only begun to discover your power! Join me, and I will complete your training! With our combined strength, we can end this destructive conflict, and bring order to the galaxy.
\DIFaddbegin \section{\DIFadd{Find The Clubroom}}
\DIFaddend

%DIF < Join us, and together we can rule the galaxy, as wheel and fresher. Come with me! It is the only way!
\DIFaddbegin \emph{\DIFadd{Add map here}}
\DIFaddend

%DIF < \end{welcome}
\DIFaddbegin \section{\DIFadd{Your Account}}
\DIFaddend

\DIFdelbegin %DIFDELCMD < \zchapter{Finding the Clubroom}%DIFDELCMD < \label{FindClubroom}%%%
%DIFDELCMD < %%%
\DIFdelend \DIFaddbegin \begin{center}
    \em
    \fontseries{l}\selectfont
    \parbox{0.85\linewidth}{
    \DIFadd{Signing up on O-Day (or in general) does not give you an account
    instantly. To get an account, you will need to go to the clubroom!
    }}
\end{center}
\DIFaddend

%DIF <  Directions to the clubroom, ideally with non terrible maps. Most people don't ever find it :-(
\DIFdelbegin %DIFDELCMD <

%DIFDELCMD < %%%
\section{\DIFdel{Directions}}
	%DIFAUXCMD
\addtocounter{section}{-1}%DIFAUXCMD
\DIFdel{The most popular way to find UCC is to first find the UWA Tavern, then follow the fence clockwise around the outside until you find the staircase marked Cameron Hall at the back. Go up the stairs to the top and walk forward to find UCC. The two maps below should give you a general view on where to go. Of course you can always ask a member for help getting here, either online or in person.
}\section{\DIFdel{Maps}}
	%DIFAUXCMD
\addtocounter{section}{-1}%DIFAUXCMD
%DIFDELCMD < \begin{figure}[H]
%DIFDELCMD < 		\centering
%DIFDELCMD < 		\includegraphics[width=0.8\textwidth]{figures/OutsideMap.eps}
%DIFDELCMD < 		%%%
%DIFDELCMD < \caption{%
{%DIFAUXCMD
\DIFdelFL{The Guild Village. Cameron Hall $=$ The Tav}}
		%DIFAUXCMD
%DIFDELCMD < \label{OutsideMap.eps}
%DIFDELCMD < 	\end{figure}
%DIFDELCMD < 	\begin{figure}[H]
%DIFDELCMD < 		\centering
%DIFDELCMD < 		\includegraphics[width=0.8\textwidth]{figures/map.png}
%DIFDELCMD < 		%%%
%DIFDELCMD < \caption{%
{%DIFAUXCMD
\DIFdelFL{Second Floor of Cameron Hall}}
		%DIFAUXCMD
%DIFDELCMD < \label{CamHallMap.eps}
%DIFDELCMD < 	\end{figure}\zchapter{Your Account}
%DIFDELCMD <

%DIFDELCMD < \rant{Signing up on O-Day (or in general) does not give you an account instantly. To get an account, you will need to go to the clubroom!}
%DIFDELCMD <

%DIFDELCMD < %%%
\DIFdelend \DIFaddbegin \noindent
\DIFaddend Once you get to the clubroom, someone will be able to help you make your
account. Simply tell someone that you need a new account and they'll run it through with you. You'll need your campus card with a 2018 \DIFdelbegin \DIFdel{UCC }\DIFdelend \DIFaddbegin \acr{UCC} \DIFaddend Membership sticker. Alternately, you can sign up at the clubroom.

Your account gives you access to all things \DIFdelbegin \DIFdel{UCC}\DIFdelend \DIFaddbegin \acr{UCC}\DIFaddend . You will gain access to a \DIFdelbegin \DIFdel{UCC-hosted email address }%DIFDELCMD < \url{ACCOUNT@ucc.asn.au}%%%
\DIFdelend \DIFaddbegin \acr{UCC}\DIFadd{-hosted email address }\url{<USER>@ucc.asn.au}\DIFaddend , a webspace at \DIFdelbegin %DIFDELCMD < \url{https://ACCOUNT.ucc.asn.au}%%%
\DIFdelend \DIFaddbegin \url{https://<USER>.ucc.asn.au}\DIFaddend , the vending machines, the club wifi, and many more services. The person who signs you up will be able to show you how all these things work.

Once you have an account, you can use it to log into any of our
clubroom machines. If you want to log onto one of our servers, you'll need
to use the \DIFdelbegin \DIFdel{SSH }\DIFdelend \DIFaddbegin \acr{SSH} \DIFaddend program. If you're having trouble, just ask someone in the
clubroom -- we don't byte!

If you need to add money to your \DIFdelbegin \DIFdel{UCC }\DIFdelend \DIFaddbegin \acr{UCC} \DIFaddend account, you'll need to ask for
someone on the \textit{Door Group}. They will be able to put money onto your
\DIFdelbegin \DIFdel{UCC }\DIFdelend \DIFaddbegin \acr{UCC} \DIFaddend account for you. \textbf{First-time members get \$5 free credit!} You
can then use this credit for everything from the Drink \& snack machines, to payment of UCC hosted events.

\DIFdelbegin %DIFDELCMD < \rowcolors{1}{lightgray}{}
%DIFDELCMD < \begin{table}[b]
%DIFDELCMD < \begin{tabular}{| l | p{7.5cm} |}
%DIFDELCMD < 	\hline
%DIFDELCMD < 	%%%
\DIFdelFL{My UCC }\DIFdelendFL \DIFaddbeginFL \subsection*{\DIFaddFL{Keep track of your details here}}

{\rowcolors{1}{gray!20!white}{}
\def\arraystretch{1.3}
\begin{tabular}{lp{4cm}}
	\DIFaddFL{My }\acr{UCC} \DIFaddendFL Username: & \DIFdelbeginFL %DIFDELCMD < \\[10px]
%DIFDELCMD < 	%%%
\DIFdelFL{My UCC }\DIFdelendFL \DIFaddbeginFL \\
	\DIFaddFL{My }\acr{UCC} \DIFaddendFL Email: & \DIFdelbeginFL %DIFDELCMD < \\[10px]
%DIFDELCMD < 	%%%
\DIFdelFL{My UCC Webspace }%DIFDELCMD < & \\[10px]
%DIFDELCMD < 	%%%
\DIFdelFL{My UUID }\DIFdelendFL \DIFaddbeginFL \\
	\DIFaddFL{My }\acr{UUID} \DIFaddendFL (5 Digits)\DIFaddbeginFL \DIFaddFL{: }\DIFaddendFL & \DIFdelbeginFL %DIFDELCMD < \\[10px]
%DIFDELCMD < 	\hline
%DIFDELCMD < %%%
\DIFdelendFL \DIFaddbeginFL \\
\DIFaddendFL \end{tabular}\DIFdelbeginFL %DIFDELCMD < \end{table}\zchapter{Dispense 101}
%DIFDELCMD < %%%
\DIFdelend \DIFaddbegin }
\DIFaddend

%DIF <  How to use Dispense.
\DIFaddbegin \section{\DIFadd{Dispense}}
\DIFaddend

%DIF < \begin{mdframed}
%DIF < \null
At the same time as you set up your account, you will also have your dispense account set up. Dispense is the program that allows users to store credit and purchase items from the coke/snack machines. Door members can help you add credit to your dispense account. Call out for one in the clubroom if need be, there's always one around.

The easiest way to dispense a drink is probably the web interface at \url{https://secure.ucc.asn.au/dispense}. Simply enter your username and password and then select a drink.

Due to technical reasons, snacks cannot be dispensed using this interface. Getting a snack will involve typing a 5 digit User \DIFdelbegin \DIFdel{ID }\DIFdelend \DIFaddbegin \acr{ID} \DIFaddend and a 4 digit PIN into the keypad. This allows you to dispense both drinks and snacks.

You can also use your Student Card or SmartRider as a log in device on the snack machine. To do so, log in to the Snack Machine and hold whichever card you want to use up to the card scanner (it's the thing with the blinking green light) and the card should auto-enrol. To log in using the card, simply hold the enrolled card up to the card scanner.

You can also access Dispense using the \shell{dispense} command. Dispense isn't installed on clubroom machines so you will have to use \DIFdelbegin %DIFDELCMD < \shell{SSH} %%%
\DIFdelend \DIFaddbegin \acr{SSH} \DIFaddend to access one of \DIFdelbegin \DIFdel{UCC}\DIFdelend \DIFaddbegin \acr{UCC}\DIFaddend 's servers.

\DIFdelbegin %DIFDELCMD < \begin{figure}[H]
%DIFDELCMD < 	\centering
%DIFDELCMD < 	\includegraphics[width=1.0\textwidth]{figures/TerminalDispense.png}
%DIFDELCMD < 	%%%
%DIFDELCMD < \caption{%
{%DIFAUXCMD
\DIFdelFL{Dispense from a terminal}}
	%DIFAUXCMD
%DIFDELCMD < \label{TerminalDispense.png}
%DIFDELCMD < \end{figure}
%DIFDELCMD < %%%
%DIF < \end{mdframed}
\chapter{\DIFdel{UCC::Clubroom}}
%DIFAUXCMD
\addtocounter{chapter}{-1}%DIFAUXCMD
\DIFdelend \DIFaddbegin \begin{minipage}{\linewidth}
    \begin{center}
        \scriptsize
        \begin{verbatim}
            /--------------------Dispense--------------------\
            | -- Coke Machine                                |
            | ->  fanta                                  69  |
            |     solo                                   80  |
            |     vpure                                 151  |
            |     creaming soda                          89  |
            |     pasito                                 77  |
            |     nullc0ke                               93  |
            |     coke                                   91  |
            | -- Electronic Payment System                   |
            |     laserprint 5 pages                     10  |
            |     clue                                  128  |
            |     UCC T-Shirt                          4000  |
            |     UCC Sleeve Logo Tee                  2500  |
            |     UCC Polo                             1800  |
            |     membership (non-student and non-guil 1250  |
            |     membership (non-student and guild)   1000  |
            |     membership (student and non-guild)    750  |
            |     membership (student and guild)        500  |
            |     MACHRM - kitkat original              115  |
            \------------------------------------------------/
             ACC Murphy           $19.74            coke,door
             q: Quit          Arrows: Select       Enter: Buy
        \end{verbatim}
    \end{center}
\end{minipage}
\DIFaddend

\DIFdelbegin %DIFDELCMD < \null
%DIFDELCMD < %%%
\DIFdelend \DIFaddbegin \section{\DIFadd{Clubroom}}

\DIFaddend The clubroom is usually open from about 9am until 11pm throughout the semester.
It is also sometimes open on weekends, and most days during university holidays. If you want to check the clubroom is open and who is there, check out \url{https://webcam.ucc.asn.au}

Within the clubroom there are a bunch desktop machines, tons of books, couches, a server room, and many people with a wide array of knowledge. We encourage our members to use them as they see fit.

We don't have cleaners, so we rely on our members to look after the clubroom. There is always a door member in the room if it's open. Of course, if you see something that needs doing such as cleaning up, feel free to do it!

\DIFdelbegin %DIFDELCMD < \begin{figure}[H]
%DIFDELCMD < 	\centering
%DIFDELCMD < 	\includegraphics[width=0.5\textwidth]{figures/webcam.jpg}
%DIFDELCMD < 	%%%
%DIFDELCMD < \caption{%
{%DIFAUXCMD
%DIFDELCMD < \url{https://webcam.ucc.asn.au}%%%
}
	%DIFAUXCMD
%DIFDELCMD < \label{webcam.jpg}
%DIFDELCMD < \end{figure}
%DIFDELCMD < %%%
\DIFdelend \DIFaddbegin \section{\DIFadd{Groups}}
\DIFaddend

\DIFdelbegin \chapter{\DIFdel{UCC::Groups}}
%DIFAUXCMD
\addtocounter{chapter}{-1}%DIFAUXCMD
%DIFDELCMD < \null
%DIFDELCMD <

%DIFDELCMD < \newenvironment{uccgroup}[1]
%DIFDELCMD < {
%DIFDELCMD < 	%%%
\section{\DIFdel{1}}
	%DIFAUXCMD
\addtocounter{section}{-1}%DIFAUXCMD
%DIF < \begin{mdframed}
	%DIF < \noindent{\bfseries Machine(s) Involved:} \server{#2} % Freshers don't need to know this
	%DIF < \end{mdframed}
%DIFDELCMD < }
%DIFDELCMD <

%DIFDELCMD < \begin{uccgroup}{Committee}
%DIFDELCMD < 	%%%
\DIFdelend \DIFaddbegin \subsection{\DIFadd{Committee}}
\DIFaddend Like most clubs, \DIFdelbegin \DIFdel{UCC }\DIFdelend \DIFaddbegin \acr{UCC} \DIFaddend elects a committee, who are responsible for the day-to-day running
of the club. The committee spends the club's money, ensures we're well stocked with Coke
and snacks and organises events. In order to keep the club running smoothly, the \DIFdelbegin \DIFdel{UCC
	}\DIFdelend \DIFaddbegin \acr{UCC}
\DIFaddend delegates certain functions to other groups, such as Wheel, Coke, and Door (see below).
Any member is permitted to attend a committee meeting, unless the President has
declared the meeting is closed to general members. If you would like to receive reminders
of the meetings, as well as the upcoming agenda, subscribe to the committee mailing list.
For historical reasons, minutes are posted to ucc@, so you probably want to subscribe to
that too.
\DIFdelbegin %DIFDELCMD < \end{uccgroup}
%DIFDELCMD < %%%
\DIFdelend

\DIFdelbegin \DIFdel{UCC }\DIFdelend \DIFaddbegin \acr{UCC} \DIFaddend has several groups to which The Committee delegates responsibilities and
duties. These groups help keep the club running on a day to day basis. Each group can be contacted via \DIFdelbegin \DIFdel{e-mail: }%
{\color{red}%DIFAUXCMD
\verb|<NAME>@ucc.asn.au|
%DIFAUXCMD
}%DIFAUXCMD
%DIFDELCMD < \verb|<NAME>@ucc.asn.au|
%DIFDELCMD < %%%
\DIFdelend \DIFaddbegin {\ttfamily\small \DIFadd{<GROUP>@ucc.asn.au}}
\DIFaddend

\DIFdelbegin %DIFDELCMD < \begin{uccgroup}{Wheel}
%DIFDELCMD < 	%%%
\DIFdelend \DIFaddbegin \subsection{\DIFadd{Wheel}}
\DIFaddend Wheel is in charge of maintaining the club's machines. They are the
best people to see if you're having problems with the computers.
Wheel maintains its own membership, but works hand in hand with
Committee on issues relating to account policy. If you abuse your
account, it will be locked by a Wheel member. The unlocking of
accounts is at the discretion of Committee. Wheel have infrequent
meetings, where they sing the secret wheel song.
\DIFdelbegin %DIFDELCMD < \end{uccgroup}
%DIFDELCMD < %%%
\DIFdelend

\DIFdelbegin %DIFDELCMD < \begin{uccgroup}{Door}
%DIFDELCMD < %%%
\DIFdelend \DIFaddbegin \subsection{\DIFadd{Door}}
\DIFaddend The Door group is responsible for the clubroom itself. Only a member
of door group can unlock the clubroom and keep it open for members
during the day. This means that if the only Door group member in the
room has to leave, then everyone will have to leave until another Door
group member arrives. Door members also have the right to remove
members from the room for poor behaviour. They are also the people to
talk to if you want to add money to your dispense account (see the section on dispense).
They can also refund credit to your account for bad dispenses and other
tasks related to dispense.
\DIFdelbegin %DIFDELCMD < \end{uccgroup}
%DIFDELCMD < %%%
\chapter{\DIFdel{2017 Committee}}
%DIFAUXCMD
\addtocounter{chapter}{-1}%DIFAUXCMD
\DIFdelend

\DIFdelbegin %DIFDELCMD < \newcommand{\committee}[2]
%DIFDELCMD < {
%DIFDELCMD < %%%
%DIF < 	\begin{mdframed}
		%DIFDELCMD < \includegraphics[width=0.2\textwidth]{figures/committee/{#1}.jpg}
%DIFDELCMD < %%%
%DIF < 	\end{mdframed}
%DIFDELCMD < }
%DIFDELCMD < %%%
\DIFdelend \DIFaddbegin \section{\DIFadd{Events}}
\DIFaddend

\DIFdelbegin %DIFDELCMD < \newcommand{\test}{
%DIFDELCMD < 	hello
%DIFDELCMD < }
%DIFDELCMD < %%%
\DIFdelend \DIFaddbegin \begin{center}
    \bfseries \DIFadd{From 2018 --- Update!
}\end{center}
\DIFaddend

\DIFdelbegin %DIFDELCMD < \begin{tabular}{c | c c}
%DIFDELCMD < 	\committee{EducationVicePresident}{Alfred Burgess}	&
%DIFDELCMD < 	\committee{President}{??} &
%DIFDELCMD < 	\committee{SocialVicePresident}{Elton Rodreguez} \\
%DIFDELCMD < 	\committee{Treasurer}{Chris Forbes}&
%DIFDELCMD < 	\committee{FresherRep}{Hock Yew Tan}&
%DIFDELCMD < 	\committee{Secretary}{Cain Nixey}\\
%DIFDELCMD < 	\committee{EducationOfficer}{Roland Kerr}&
%DIFDELCMD < 	%%%
\textbf{\DIFdel{Want to be Fresher rep?}}
	%DIFAUXCMD
%DIFDELCMD < \committee{SocialOfficer}{Cam Locke}\\
%DIFDELCMD < 	\committee{OCM_1}{Samuel Shenton}&
%DIFDELCMD < 	\committee{OCM_2}{Jake Alexander}
%DIFDELCMD < \end{tabular}
%DIFDELCMD < %%%
\chapter{\DIFdel{2018 Events}}
%DIFAUXCMD
\addtocounter{chapter}{-1}%DIFAUXCMD
%DIFDELCMD <

%DIFDELCMD < %%%
\DIFdel{UCC runs a lot of events. You should go to them!
Dates and times may be subject to change. You should also check out our Facebook page where we will advertise all of our events throughout the year.
}%DIFDELCMD <

%DIFDELCMD < %%%
%DIF <  Event with title and date
\DIFdelend \newenvironment{event}[3]
{
	\DIFdelbegin %DIFDELCMD < \begin{mdframed}[backgroundcolor=white,nobreak=true]
%DIFDELCMD < 		\color{black}{\section{#1}}
%DIFDELCMD < 		\begin{mdframed}[backgroundcolor=white]
%DIFDELCMD < 			%%%
\DIFdel{When: #2
			Where: #3
		}%DIFDELCMD < \end{mdframed}
%DIFDELCMD < }{
%DIFDELCMD < 	\end{mdframed}
%DIFDELCMD < }
%DIFDELCMD <

%DIFDELCMD < %%%
%DIF <  Simpler (no boxes)
%DIFDELCMD < \renewenvironment{event}[3]
%DIFDELCMD < {
%DIFDELCMD < 	%%%
\section{\DIFdel{#1}}
	%DIFAUXCMD
\addtocounter{section}{-1}%DIFAUXCMD
\DIFdelend \DIFaddbegin \subsection{\DIFadd{#1}}
	\DIFaddend \noindent {\bfseries When:} #2 \\
	{\bfseries Where:} #3 \DIFdelbegin %DIFDELCMD <

%DIFDELCMD < %%%
\DIFdelend \DIFaddbegin \\
\DIFaddend }{}
\newenvironment{event_2}[2]
{
	\DIFdelbegin \section{\DIFdel{#1}}
	%DIFAUXCMD
\addtocounter{section}{-1}%DIFAUXCMD
\DIFdelend \DIFaddbegin \subsection{\DIFadd{#1}}
	\DIFaddend {\bfseries Where:} #2 \DIFdelbegin %DIFDELCMD <

%DIFDELCMD < %%%
\DIFdelend \DIFaddbegin \\
\DIFaddend }{}

\DIFdelbegin \section*{\DIFdel{Semester 1}}
%DIFAUXCMD
\DIFdelend \DIFaddbegin \subsection*{\DIFadd{Semester 1}}
\DIFaddend

\DIFdelbegin %DIFDELCMD < \begin{event}{Fresher Welcome @ 1700}{X March}{UCC Clubroom}
%DIFDELCMD < 		%%%
\DIFdelend \DIFaddbegin \begin{event}{Fresher Welcome @ 1700}{X March}{\acr{UCC} Clubroom}
    \DIFaddend This event is to welcome you, a new UCC member, to the club. There will be members new and old to talk to and get to know.
\end{event}

\begin{event}{Intro to Programming}{Starting Wk3; Friday 1600 Weekly}{UCC Clubroom}
    Ever wonder how computers work? Ever wanted to make a game or similar? Do you want to learn to program but not know how to start. We'll be teaching people from absolute beginners to those with a bit of skill everything you might want to know as we work towards building a basic game from scratch. We'll be using C++.
\end{event}

\begin{event}{AGM}{13 March @ 1300}{Guild Council Meeting Room}
    The meeting to elect the new committee for 2017. We have a position just for you, the Fresher representative. You should attend to either run or vote for the person who will represent you in the committee. If you don't know where it is, people will guide you from the clubroom.
\end{event}
\begin{event}{Quiz Night}{TBA}{University Tavern}
    Bringing together the various clubs of Cameron Hall, the quiz night is the only proper time to use your smarts throughout your degree.  [18+ Event].
\end{event}

\DIFdelbegin \section*{\DIFdel{Semester 2}}
	%DIFAUXCMD
\DIFdelend \DIFaddbegin \subsection*{\DIFadd{Semester 2}}
\DIFaddend \begin{event}{Camp}{Midyear Break}{Lake Leschenaultia}
    UCC goes camping, minus tents. During the winter break, UCC members travel up to the dormitory at Camp Leschenaultia for a weekend long LAN. There will be internet. [18+ Event]
\end{event}
\DIFdelbegin %DIFDELCMD < \begin{event}{44th Anniversary Dinner}{TBD}{TBA}
%DIFDELCMD < 		%%%
\DIFdelend \DIFaddbegin \begin{event}{44th Anniversary Dinner}{\acr{TBD}}{\acr{TBA}}
    \DIFaddend The 44th anniversary of our club. For the celebration, a dinner will be held. Feel free to come along to meet some of the older members, as well to have a general chat with your fellow UCCans.
\end{event}
\begin{event}{Charity Vigil}{Semester 2 - Overnight}{Cameron Hall}
    Once a year, all the clubs of Cameron Hall get together for a night of fun, games, and raising money for charity. The details of the night are still to come, but UCC traditionally hosts a LAN. There will be an entry fee for the event.
\end{event}

\DIFdelbegin \section*{\DIFdel{General}}
	%DIFAUXCMD
%DIFDELCMD < \begin{event_2}{Movie Nights}{UCC Clubroom}
%DIFDELCMD < 		%%%
\DIFdelend \DIFaddbegin \subsection*{\DIFadd{General}}
\begin{event_2}{Movie Nights}{\acr{UCC} Clubroom}
    \DIFaddend UCC holds movie nights in the clubroom throughout the year complete with pizza and couches. A relaxed night to hang out with fellow UCCans.
\end{event_2}
\DIFdelbegin %DIFDELCMD < \begin{event_2}{CITS Night}{UCC Clubroom}
%DIFDELCMD < 		%%%
\DIFdelend \DIFaddbegin \begin{event_2}{CITS Night}{\acr{UCC} Clubroom}
    \DIFaddend Close to major project due dates for the computer science faculty, UCC hosts a night where people taking computer science units can come in to work on their projects. Gaming is generally discouraged on this night.
\end{event_2}
\begin{event_2}{VIVE Night}{The Loft}
    UCC has a VR headset that we setup on a regular basis for our members to use. Come along for an evening of games and pizza.
\end{event_2}
\DIFdelbegin %DIFDELCMD < \zchapter{Services}
%DIFDELCMD < \begin{comment}%DIFDELCMD <
%DIFDELCMD < This Chapter provides an overview of UCC's services (as of February 2018); how to use them, what they are for, what servers are responsible for them. The full hostname for a server is \server{server.ucc.asn.au}.
%DIFDELCMD < Servers are usually named after fish beginning with M. This is because they are in the Machine Room, and they run Linux. The mascot for Linux is Tux, a penguin, and he likes to eat fish.
%DIFDELCMD < Remember that all services are maintained by UCC's members. If you are interested in learning more, or running a new service, ask someone!
%DIFDELCMD < \end{comment}
%DIFDELCMD < %%%
\DIFdelend


\DIFdelbegin %DIFDELCMD < \newenvironment{uccservice}[1]
%DIFDELCMD < {
%DIFDELCMD < 	%%%
\DIFdelend \section{\DIFdelbegin \DIFdel{#1}\DIFdelend \DIFaddbegin \DIFadd{Services}\DIFaddend }
%DIF < \begin{mdframed}
		%DIF < \noindent{\bfseries Machine(s) Involved:} \server{#2} % Freshers don't need to know this
	%DIF < \end{mdframed}
\DIFdelbegin %DIFDELCMD < }
%DIFDELCMD < %%%
%DIF < ================================================#
%DIFDELCMD < \newline
%DIFDELCMD < %%%
%DIF < ================================================#
%DIFDELCMD < \begin{uccservice}{Drinks \& Snacks -- Dispense}
%DIFDELCMD < 	%%%
\DIFdel{UCC}\DIFdelend \DIFaddbegin

\begin{center}
    \em
    \fontseries{l}\selectfont
    \parbox{0.9\linewidth}{
    \DIFadd{This is an overview of the services running. The full hostname for a given
    server is }\url{server.ucc.asn.au}\DIFadd{. Remember that these services are maintained by
    ucc's members, so if you want to know more, ask someone!
    The servers usually are named after a fish starting with ``M'', as they are
    in the }{\mdseries \DIFadd{M}}\DIFadd{achine room and run Linux, the mascot of which is Tux: a
    penguin, who likes to eat fish.
    }}
\end{center}

\subsection{\DIFadd{Drinks \& Snacks -- Dispense}}
\acr{UCC}\DIFaddend 's most successful service is undoubtably the internet connected coke machine
and not quite internet connected snack machine. These use serial communications to talk to merlo, which runs open source software written by talented members including John Hodge, Mark Tearle and David Adam.
A relay connected to merlo can be activated by door members from the snack machine to open the club's electronic door lock.
\DIFdelbegin %DIFDELCMD < \end{uccservice}
%DIFDELCMD < %%%
\DIFdelend %================================================#
\DIFdelbegin %DIFDELCMD < \begin{uccservice}{Games}
%DIFDELCMD < 	%%%
\DIFdelend \DIFaddbegin \subsection{\DIFadd{Games}}
\DIFaddend The Heathred A. Loveday memorial games server hosts many games including: Minecraft, TF2 and Wolfenstein: Enemy Territory (ET).
Administrator access to heathred is fairly unrestricted; it is also available as a general use server. For example, its GPU has been used in the past for number crunching projects.
\DIFdelbegin %DIFDELCMD < \end{uccservice}
%DIFDELCMD < %%%
\DIFdelend %================================================#
%DIF < \begin{uccservice}{Music}
%DIF > \subsection{Music}
%	TODO
%}
%DIF < \end{uccservice}
\DIFaddbegin

\DIFaddend %================================================#
\DIFdelbegin %DIFDELCMD < \begin{uccservice}{Email}
%DIFDELCMD < 	%%%
\DIFdelend \DIFaddbegin \subsection{\DIFadd{Email}}
\DIFaddend UCC proudly runs its own mail server. You have an email account \texttt{<username@ucc.asn.au>}. Upon creating your account you can choose an address to foward all emails to. You can change this at any time by editing the ".forward" file in your home directory.\\
A webclient is availiable at \url{https://webmail.ucc.asn.au} for ease of access. Other methods such as alpine for your own mail client work as well.
\DIFdelbegin %DIFDELCMD < \end{uccservice}
%DIFDELCMD < 	\begin{comment}
	% Normal people just use forwarding
	Alternately, you can use one of several methods to check your UCC email directly.
	\begin{enumerate}
		\item alpine --- Connect via SSH and run "alpine".
		\item webmail --- Several options will be presented to you at \url{https://webmail.ucc.asn.au}
		\item mail client (eg: Thunderbird) --- The server name is \server{secure.ucc.asn.au}. Use port 993 and IMAP. With your UCC username and password.
	\end{enumerate}
	\end{comment}
%DIFDELCMD < %%%
\DIFdelend \DIFaddbegin \begin{comment}
% Normal people just use forwarding
Alternately, you can use one of several methods to check your UCC email directly.
\begin{enumerate}
    \item alpine --- Connect via SSH and run "alpine".
    \item webmail --- Several options will be presented to you at \url{https://webmail.ucc.asn.au}
    \item mail client (eg: Thunderbird) --- The server name is \server{secure.ucc.asn.au}. Use port 993 and IMAP. With your UCC username and password.
\end{enumerate}
\end{comment}
\DIFaddend %================================================#
\DIFdelbegin %DIFDELCMD < \begin{uccservice}{WebHosting}
%DIFDELCMD < 	%%%
\DIFdelend \DIFaddbegin \subsection{\DIFadd{WebHosting}}
\DIFaddend Members can publish their own sites! SSH to a server and edit the files in the directory "public-html". The website will appear at \url{https://username.ucc.asn.au}.
\DIFdelbegin %DIFDELCMD < \end{uccservice}
%DIFDELCMD < %%%
\DIFdelend %================================================#
\DIFdelbegin %DIFDELCMD < \begin{uccservice}{File Storage}
%DIFDELCMD < 	%%%
\DIFdelend \DIFaddbegin \subsection{\DIFadd{File Storage}}
\DIFaddend With your account comes not one, but \emph{two} \DIFdelbegin \DIFdel{"home" }\DIFdelend \DIFaddbegin \DIFadd{``home'' }\DIFaddend directories for all your
file storage needs. Both can be accessed through \DIFdelbegin \DIFdel{SSH, FTP, a UCC }\DIFdelend \DIFaddbegin \acr{SSH}\DIFadd{, }\acr{FTP}\DIFadd{, a }\acr{UCC} \DIFaddend Windows or Linux machine, or from your phone if you have a \DIFdelbegin \DIFdel{FTP}\DIFdelend \DIFaddbegin \acr{FTP}\DIFaddend /\DIFdelbegin \DIFdel{SSH }\DIFdelend \DIFaddbegin \acr{SSH} \DIFaddend client installed. There is (currently) no enforced limit for how much you can store, but very large accounts are left out of our back-up server.
\DIFdelbegin %DIFDELCMD < \end{uccservice}
%DIFDELCMD < %%%
\DIFdelend %================================================#
\DIFdelbegin %DIFDELCMD < \begin{uccservice}{VM Hosting}
%DIFDELCMD < 	%%%
\DIFdelend \DIFaddbegin \subsection{\DIFadd{VM Hosting}}
\DIFaddend Members can get their own \DIFdelbegin \DIFdel{VM hosted at UCC }\DIFdelend \DIFaddbegin \acr{VM} \DIFadd{hosted at }\acr{UCC} \DIFaddend by contacting someone on the wheel group to set it up for them.
%\server{medico} runs the amazing ProxMox interface and is used for all new VMs. The typical way to use this interface is from a web browser on \server{maaxen}, a VM running on \server{medico}...
%\server{heathred} is used for VMs when wheel complains that they aren't important enough to justify using all of \server{medico}'s CPU *cough* minecraft *cough*.
\DIFdelbegin %DIFDELCMD < \end{uccservice}
%DIFDELCMD < %%%
\DIFdelend

%DIF < ================================================#
%DIF < \begin{uccservice}{Develupment Environments}
%DIF < 	TODO
%DIF < \end{uccservice}
%DIF < ================================================#
%DIF < ================================================#\chapter{Cheet Sheet}
\DIFdelbegin %DIFDELCMD < \renewcommand{\familydefault}{\ttdefault}
%DIFDELCMD < 	\rowcolors{1}{}{lightgray}
%DIFDELCMD < %%%
\DIFdelend \DIFaddbegin \section{\DIFadd{Glossary}}
\DIFaddend

\DIFdelbegin %DIFDELCMD < \begin{tabular}{p{0.3\linewidth}|p{0.7\linewidth}}
%DIFDELCMD < \rowcolor{black} \color{white}{Term} %%%
\DIFdelend \DIFaddbegin \begin{center}
    \small
    \def\arraystretch{1.2}
    \begin{tabular}{>{\fontseries{sb}\selectfont}l>{\raggedright\arraybackslash}p{7.5cm}}
        \toprule
        \DIFadd{Term }\DIFaddend & \DIFdelbegin %DIFDELCMD < \color{white}{Translation} %%%
\DIFdelend \DIFaddbegin \DIFadd{Description }\DIFaddend \\
        \DIFdelbegin \DIFdel{Dr ACC }\DIFdelend \DIFaddbegin \midrule
        \DIFadd{Dr }\acr{ACC} \DIFaddend Murphy			&	A computer called Murphy. Truely infamous around the clubroom. \\
\DIFdelbegin \DIFdel{TLA						}\DIFdelend \DIFaddbegin \acr{TLA}						\DIFaddend &	Three Letter Acronym. Every \DIFdelbegin \DIFdel{TLA }\DIFdelend \DIFaddbegin \acr{TLA} \DIFaddend is unique and most UCCaneers have one to refer to themselves in documentation.	\\
Coke Credit				&	Money on your account used for the drink and snack machines. \\
\DIFdelbegin \DIFdel{IRC						}\DIFdelend \DIFaddbegin \acr{IRC}						\DIFaddend &	Internet Relay Chat. An old-school protocol for chatting with people online that many UCCans still use daily. \\
The Loft				&	The area above the \DIFdelbegin \DIFdel{UCC }\DIFdelend \DIFaddbegin \acr{UCC} \DIFaddend that looks down into the \DIFdelbegin \DIFdel{UCC }\DIFdelend \DIFaddbegin \acr{UCC} \DIFaddend clubroom. LAN gaming and other activities take place up there. \\
Mailing lists			&	A way of communicating with a very large number of people via email. The \DIFdelbegin \DIFdel{UCC }\DIFdelend \DIFaddbegin \acr{UCC} \DIFaddend has several mailing lists of varying popularity.\\
UCCan					&	Someone who spends a lot of time in the \DIFdelbegin \DIFdel{UCC}\DIFdelend \DIFaddbegin \acr{UCC}\DIFaddend . \\
Door Group				&	The group responsible for maintaining the clubroom and it's contents. \\
Wheel Group				&	The group responsible for maintaining computers, accounts and services in \DIFdelbegin \DIFdel{UCC}\DIFdelend \DIFaddbegin \acr{UCC}\DIFaddend . \\
UniSFA					&	University Science Fiction Association. A fellow club in Cameron Hall. \\
UniGames				&	A club specialising in board games, \DIFdelbegin \DIFdel{RPGs}\DIFdelend \DIFaddbegin \acr{RPG}\DIFadd{s}\DIFaddend , etc. A fellow club of Cameron Hall. \\
% Commands
\DIFdelbegin \textit{\DIFdel{passwd}}			%DIFAUXCMD
\DIFdelend \DIFaddbegin \shell{passwd}			\DIFaddend &	Enter this command while connected to \textit{mussel} to change your UCC password. \\
\DIFdelbegin \textit{\DIFdel{ssh <SERVER>}}	%DIFAUXCMD
\DIFdelend \DIFaddbegin \shell{ssh <SERVER>}	\DIFaddend &	This command, when given the name of a server, will allow you to connect to the machine from your computer.	\\
Motsugo					&	Host of secure user home directories, main user shell server. Also a fish.\\
%Mussel					&	Mussel is one of the UCC's "user" servers that also provides the IRC server and is the primary LDAP server.\\
%Heathred				&	The Heathred A. Loveday memorial games server; hosts various game servers. \\
\DIFdelbegin \textit{\DIFdel{man <COMMAND>}}	%DIFAUXCMD
\DIFdelend \DIFaddbegin \shell{man <COMMAND>}	\DIFaddend &	Outputs the manual for a command. One of the best pitstops for information on UNIX commands.	\\
\DIFdelbegin \textit{\DIFdel{irssi}}			%DIFAUXCMD
\DIFdelend \DIFaddbegin \shell{irssi}			\DIFaddend &	A terminal-based IRC client.	\\
\DIFdelbegin \textit{\DIFdel{dispense}}		%DIFAUXCMD
\DIFdelend \DIFaddbegin \shell{dispense}		\DIFaddend &	Opens the terminal window to dispense a drink from our drink machine. \\
        \DIFaddbegin \bottomrule
    \DIFaddend \end{tabular}
\DIFdelbegin \chapter{\DIFdel{Communication Technologies}}%DIFAUXCMD
\addtocounter{chapter}{-1}%DIFAUXCMD
%DIFDELCMD < \label{Communications}
%DIFDELCMD < %%%
%DIF < ========================================================================#
%DIFDELCMD < \newenvironment{ucclist}[1]
%DIFDELCMD < {
%DIFDELCMD < 	\begin{mdframed}[nobreak=true]
%DIFDELCMD < 	%%%
\subsection{\DIFdel{#1}}
	%DIFAUXCMD
\addtocounter{subsection}{-1}%DIFAUXCMD
%DIFDELCMD < \begin{mdframed}
%DIFDELCMD < 		%%%
\DIFdel{Address:  <}%DIFDELCMD < \href{mailto:#1@ucc.asn.au}{#1@ucc.asn.au}%%%
\DIFdel{>
	}%DIFDELCMD < \end{mdframed}
%DIFDELCMD < 	\begin{mdframed}
%DIFDELCMD < 		%%%
\DIFdel{Subscribe:  }%DIFDELCMD < \small{\url{https://lists.ucc.asn.au/mailman/listinfo/#1}}
%DIFDELCMD < 	\end{mdframed}
%DIFDELCMD < }{\end{mdframed}}
%DIFDELCMD < %%%
%DIF < ========================================================================#
%DIF < ========================================================================#
\DIFdelend \DIFaddbegin \end{center}

\DIFaddend \section{\DIFdelbegin \DIFdel{Social Media}\DIFdelend \DIFaddbegin \DIFadd{Contact}\DIFaddend }
\DIFaddbegin

\subsection{\DIFadd{Social Media}}
\urlstyle{same}
\DIFaddend \begin{itemize}
	\item Facebook:		\url{https://www.facebook.com/groups/universitycomputerclub/}
	\item Twitter:		\url{https://twitter.com/ucc_status}
	\item Steam:		\url{https://steamcommunity.com/groups/UCC}
	\item GitHub:		\url{https://github.com/ucc}
	\item discord:		\url{https://discord.gg/G8bsgBE}
\end{itemize}
%========================================================================#
\DIFdelbegin \section{\DIFdel{Email}}
%DIFAUXCMD
\addtocounter{section}{-1}%DIFAUXCMD
\DIFdelend \DIFaddbegin \subsection{\DIFadd{Email}}
\DIFaddend Some useful emails that you might like to contacts are:
\begin{itemize}
	\item Committee:				\href{mailto:committee@ucc.asn.au}{committee@ucc.asn.au}
	\item Fresher Rep				\href{mailto:fresher@ucc.asn.au}{fresher@ucc.asn.au}
	\item For anything tech-related	\href{mailto:tech@ucc.asn.au}{tech@ucc.asn.au}
\end{itemize}
%========================================================================#
\DIFdelbegin \section{\DIFdel{Mailing Lists}}
%DIFAUXCMD
\addtocounter{section}{-1}%DIFAUXCMD
\DIFdel{UCC }\DIFdelend \DIFaddbegin \subsection{\DIFadd{Mailing Lists}}
\acr{UCC} \DIFaddend often uses email for communication. There are various lists that you can sign up for at \url{https://lists.ucc.asn.au}. The most popular lists are \texttt{ucc-announce@} for announcements and \texttt{ucc@} for general discussion.\\
If you are interested in technology, join the \texttt{tech@} list.\\
If you want to be kept up to date with management of the club, join \texttt{committee@}.
%========================================================================#
\DIFdelbegin \section{\DIFdel{IRC}}
%DIFAUXCMD
\addtocounter{section}{-1}%DIFAUXCMD
\DIFdel{UCC }\DIFdelend \DIFaddbegin \subsection{\DIFadd{IRC}}
\acr{UCC} \DIFaddend hosts our own \DIFdelbegin \DIFdel{IRC }\DIFdelend \DIFaddbegin \acr{IRC} \DIFaddend (Internet Relay Chat) server that many of our members use.
You can connect with an \DIFdelbegin \DIFdel{IRC client to }\texttt{\DIFdel{irc://irc.ucc.asn.au:6667}} %DIFAUXCMD
\DIFdelend \DIFaddbegin \acr{IRC} \DIFadd{client to }\href{irc://irc.ucc.asn.au:6667}{irc://irc.ucc.asn.au:6667} \DIFaddend and join the channel \texttt{\#ucc}, or with a web browser go to
\url{https://irc.ucc.asn.au}.\\
The IRC channel is mirrored to \DIFdelbegin \DIFdel{a discordchannel at }%DIFDELCMD < \url{}%%%
\DIFdel{.
%DIF < ========================================================================#
}\section{\DIFdel{Other}}
%DIFAUXCMD
\addtocounter{section}{-1}%DIFAUXCMD
\DIFdelend \DIFaddbegin \DIFadd{discord.
%DIF > ========================================================================#q
}\subsection{\DIFadd{Other}}
\DIFaddend \begin{itemize}
	\item Website:	\url{https://www.ucc.asn.au}
	\item \DIFdelbegin \DIFdel{UCC }\DIFdelend \DIFaddbegin \acr{UCC} \DIFaddend Wiki:	\url{https://wiki.ucc.asn.au}
	\item Phone:	(08) 6488 3901
%	\item Fax:		NULL
\end{itemize}

\end{document}
