merge branches

Merge branch 'gh-pages'

Conflicts:
	data/Paired two-sample t-test.csv
	images/Rcmdr20.png
	images/Rcmdr21.png
	images/Rcmdr23.png
	images/Rcmdr24.png
	install.pdf
	lecture.Rnw
	lecture.pdf
	manual.Rnw
	practical.Rnw
	practical.pdf

Author: markdunning

Course Data.zip

@@ -0,0 +1 @@
+dunnin01 ,dunnin01,dunnin01-unix,01.04.2014 10:27,file:///home/dunnin01/.config/libreoffice/4;

Course Data/.~lock.diseaseX.csv#

@@ -0,0 +1,13 @@
+FROM centos:centos7
+MAINTAINER Mark Dunning<mark.dunning@cruk.cam.ac.uk>
+
+RUN rpm -ivh http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm && \
+    yum install -y git ed tar R libpng-devel mesa-libGL-devel mesa-libGLU-devel NLopt-devel
+
+RUN Rscript -e 'install.packages(c("Rcmdr","XLConnect","XLConnectJars","rJava","sem","relimp","multcomp","markdown","lmtest","leaps","knitr","effects","aplpack","matrixcalc","mvtnorm","TH.data","mime","evaluate","formatR","highr","rgl"),repos="http://cran.rstudio.com")'
+
+RUN useradd -g users -m rcmdr
+ENV HOME /home/rcmdr
+USER rcmdr
+RUN cd $HOME && git clone https://github.com/bioinformatics-core-shared-training/IntroductionToStats.git
+CMD /usr/bin/R

Dockerfile

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 Ovarian,Peritoneal
 1201.33,1155.98
 1029.64,1020.82
@@ -19,3 +20,26 @@ Ovarian,Peritoneal
 1146.75,1132.8
 881.5,847.78
 1315.22,1337.8
+=======
+A,B
+1201.33,1155.98
+1029.64,1020.82
+895.57,881.21
+842.14,830.78
+903.07,897.06
+1311.57,1262.73
+833.52,823.06
+1007.66,951.01
+1465.51,1450.98
+967.82,978.15
+812.72,778.26
+884.08,823.57
+1358.56,1335.78
+1280.1,1293.91
+942.38,925.75
+884.33,891.34
+930.09,892.02
+1146.75,1132.8
+881.5,847.78
+1315.22,1337.8
+>>>>>>> gh-pages