fixed typos

1 files changed, 11 insertions, 6 deletions

diff --git a/writeup/writeup.tex b/writeup/writeup.tex
index a0fec13..72e93f9 100644
--- a/writeup/writeup.tex
+++ b/writeup/writeup.tex
@@ -66,7 +66,7 @@ of ways of how FOSS software is used compared to its proprietary counterparts.
 
 \section{What is Free Software?} The Free Software movement is one that has been active for over 40 years
 \cite{GNUmaifesto}, it has created some of the most important tools in computing that are used by billions on a
-daily basis.  It is so engraved in our lives, yet so few even know what the term means; In a simple note, it is
+daily basis. It is so engraved in our lives, yet so few even know what the term means; In a simple note, it is
 software for a computer, phone or other device that can be used without violating the users freedom.
 
 The definition of what counts Free Software and what is software freedom can vary depending on who you ask, but
@@ -121,7 +121,7 @@ that software was not a commodity to be sold, but a resource to be shared.
 
 A key figure in \textit{hacker culture}, as previously mentioned, is Richard Stallman. In the
  1980's he left his job at MIT to work full time on the GNU project, which was designed
-to be a full recreation of AT\&T's Unix operating system from the ground up as Free Software.  The idea was to
+to be a full recreation of AT\&T's Unix operating system from the ground up as Free Software. The idea was to
 allow anyone access to a Unix like machine without paying AT\&T's expensive license fees, and allow any user to
 view it, redistribute or edit; it was to be the first fully free operating system. The early development of GNU
 was relatively slow, and it was not a completely free system for many years, as some core parts of the operating
@@ -131,7 +131,7 @@ final additions would be created.
 In 1988 the BSD Net1 operating system would release\cite{BSDnet1}, this was the first fully open version of the
 Berkeley Software Distribution version of Unix. BSD was by no means new by this point, however it wasn't fully
 free until this point. This version had completely rewritten all the code from the original Unix that previous
-versions contained, meaning it was now completely free from AT\&T's licenses.  It would be the start of a long
+versions contained, meaning it was now completely free from AT\&T's licenses. It would be the start of a long
 linage of Open Source operating systems which are now the base of MacOS, FreeBSD and OpenBSD and is often deemed
 as the first Open Source operating system.
 
@@ -183,8 +183,13 @@ least one of these, and thus will be familiar with them.
 \subsection{Programming IDE's} 
 \textit{An \textbf{IDE} is an \textbf{I}ntegrated \textbf{D}evelopment \textbf{E}nvironment}
 
+<<<<<<< HEAD
 The main IDE's used by developers are Free Software, but there are a few Non-free ones that are used according to
 the stack over flow developer survey\cite{IDEusage}.  To compare text editors, one can look at \textit{VS Code} as
+=======
+The main IDE's used by developers are Free Software, but there are a few Non-Free ones that are used according to
+the stack over flow developer survey\cite{IDEusage}. To compare text editors, one can look at \textit{VS Code} as
+>>>>>>> 9fc64f8 (fixed typos)
 an example of open software, with 73\% of developers claiming to have used it at some point, and \textit{IntelliJ},
 as an example of Non-Free Software, with 26\% of developers claiming to have used it at some point\cite{IDEusage}.
 
@@ -230,14 +235,14 @@ amongst users, as it will disallow AD blockers, and other extensions that select
 
 In today's world, the majority of browsers are based on Chrome in some way or another with Firefox being one of
 the few exceptions to this rule. Due to this, most browsers will be effected by manifest V3 as it comes into full
-effect in the coming years.  As this happens it will become increasingly hard to deny that Firefox is easier to
+effect in the coming years. As this happens it will become increasingly hard to deny that Firefox is easier to
 customize and make usable to the users needs.
 
 \subsection{Office Software} 
 When looking at office software, their are two commonly used tools, Microsoft Office
-(also known as 365), and Libreoffice.  Microsoft Office is Proprietary software, and has been since its creation
+(also known as 365), and Libreoffice. Microsoft Office is Proprietary software, and has been since its creation
 in the early days of personal computing, Libreoffice on the other hand, has been FOSS software from the start
-(libre actually means free in spanish, so this is no surprise).  They both provide advanced features, and for the
+(libre actually means free in spanish, so this is no surprise). They both provide advanced features, and for the
 most part are completely cross compatible. In this sense they have become almost identical tools.
 
 As the tools are so similar one will find it's not worth comparing them, in this way we can say that there is no