changeset 2273:ad2e070c92e5

Weird merge error fix

--- a/README.md	Wed Apr 20 19:03:07 2016 +0200
+++ b/README.md	Wed Apr 20 19:07:03 2016 +0200
@@ -16,6 +16,14 @@
 Please refer to ['docs/Instructions/Instructions.pdf'](https://github.com/BrechtDeMan/WebAudioEvaluationTool/raw/master/docs/Instructions/Instructions.pdf).
 
 
+## Dependencies
+
+Runs out of the box on any web server with PHP (tested on PHP 5.1<=), no third party software needed. 
+
+Alternatively, a local server (no web server or internet connection needed!) and optional Python analysis scripts run on Python 2.7 or 3.x. 
+Plots rendered using [matplotlib](http://matplotlib.org), [NumPy](http://matplotlib.org) and [SciPy](http://scipy.org). 
+
+
 ## Academic use
 
 ### Citing
@@ -37,6 +45,7 @@
 
 Please refer to LICENSE.txt ([GNU General Public License](http://www.gnu.org/licenses/gpl-3.0.en.html)).
 
+
 ## Other use
 
 Other licensing schemes are available - please contact the authors regarding non-academic use. 

--- a/docs/Instructions/Instructions.tex	Wed Apr 20 19:03:07 2016 +0200
+++ b/docs/Instructions/Instructions.tex	Wed Apr 20 19:07:03 2016 +0200
@@ -316,14 +316,14 @@
 		From \cite{waetwac}. 
 
 		% TODO: add labels like (\textbf{\texttt{horizontal-sliders}}) to show which type of interface can be created using which template
-
+		
 		\begin{itemize}
 			\item AB Test / Pairwise comparison~\cite{lipshitz1981great,david1963method}: Two stimuli presented simultaneously, participant selects a preferred stimulus.
 			\item ABC/HR (ITU-R BS. 1116)~\cite{recommendation19971116} (Mean Opinion Score: MOS): each stimulus has a continuous scale (5-1), labeled as Imperceptible, Perceptible but not annoying, Slightly annoying, Annoying, Very annoying.
 			\item -50 to 50 Bipolar with Ref: each stimulus has a continuous scale -50 to 50 with default values as 0 in middle and a reference.
 			\item Absolute Category Rating (ACR) Scale~\cite{rec1996p}: Likert but labels are Bad, Poor, Fair, Good, Excellent 
 			\item ABX Test~\cite{clark1982high}: Two stimuli are presented along with a reference and the participant has to select a preferred stimulus, often the closest to the reference.
-			\item APE \cite{ape}: Multiple stimuli on one or more axes for inter-sample rating.
+			\item APE~\cite{ape}: Multiple stimuli on one or more axes for inter-sample rating.
 			%\item APE style 2D \cite{ape}: Multiple stimuli on a 2D plane for inter-sample rating (e.g. Valence Arousal). % TO BE IMPLEMENTED 
 			\item Comparison Category Rating (CCR) Scale~\cite{rec1996p}: ACR \& DCR but 7 point scale, with reference: Much better, Better, Slightly better, About the same, Slightly worse, Worse, Much worse.
 			\item Degredation Category Rating (DCR) Scale~\cite{rec1996p}: ABC \& Likert but labels are (5) Inaudible, (4) Audible but not annoying, (3) Slightly annoying, (2) Annoying, (1) Very annoying.
@@ -335,6 +335,7 @@
 			\item 9 Point Hedonic Category Rating Scale~\cite{peryam1952advanced}: each stimulus has a seven point scale with values: Like extremely, Like very much, Like moderate, Like slightly, Neither like nor dislike, Dislike extremely, Dislike very much, Dislike moderate, Dislike slightly. There is also a provided reference.
 		\end{itemize}
 
+
 	\subsection{Building your own interface}
 
 		\subsubsection{Nodes to familiarise}