package up ready to move
Merge branch 'master' of https://github.com/hitchpy/stat250_a1

Conflicts:
	stat250_hw1/AirlineDelays/DESCRIPTION
	stat250_hw1/AirlineDelays/NAMESPACE
	stat250_hw1/AirlineDelays/R/getDelayFreqTable.R
	stat250_hw1/AirlineDelays/src/RreadRecord.c
	stat250_hw1/AirlineDelays/src/RreadRecords.h
	stat250_hw1/AirlineDelays/src/Rthreads.c
	stat250_hw1/AirlineDelays/src/readRecords.c
	stat250_hw1/AirlineDelays/src/readRecords.h
	stat250_hw1/AirlineDelays/src/threads.c
	stat250_hw1/AirlineDelays/src/threads.h
	stat250_hw1/ArrDelays/DESCRIPTION
	stat250_hw1/ArrDelays/NAMESPACE
	stat250_hw1/ArrDelays/R/Ctable.r
	stat250_hw1/ArrDelays/R/Rtable.r
	stat250_hw1/ArrDelays/src/ArrDelay.c
	stat250_hw1/DotCallCopy/foo.c
	stat250_hw1/DotCallCopy/run.R
	stat250_hw1/FrequencyTable/DESCRIPTION
	stat250_hw1/FrequencyTable/NAMESPACE
	stat250_hw1/FrequencyTable/R/mean.R
	stat250_hw1/HW1_report.Rnw
	stat250_hw1/HW1_report.pdf
	stat250_hw1/Hadoop/ArrivalDelayMapper.class
	stat250_hw1/Hadoop/ArrivalDelayMapper.java
	stat250_hw1/Hadoop/ArrivalDelayReduce.class
	stat250_hw1/Hadoop/ArrivalDelayReduce.java
	stat250_hw1/Hadoop/DelaysFrequencyTable.java
	stat250_hw1/Hadoop/GNUmakefile
	stat250_hw1/Hadoop/README
	stat250_hw1/Hadoop/SETUP
	stat250_hw1/Hadoop/compare.R
	stat250_hw1/Hadoop/eg.jar
	stat250_hw1/HadoopC++/GNUmakefile
	stat250_hw1/HadoopC++/Notes
	stat250_hw1/HadoopC++/delays.cpp
	stat250_hw1/JavaThreads/Delays.java
	stat250_hw1/JavaThreads/GNUmakefile
	stat250_hw1/JavaThreads/Notes
	stat250_hw1/JavaThreads/SequentialDelays.java
	stat250_hw1/MCMC/COUP551_rates.dat
	stat250_hw1/MCMC/MCMC.html
	stat250_hw1/MCMC/Notes
	stat250_hw1/MCMC/README.md
	stat250_hw1/MCMC/chptmodel.pdf
	stat250_hw1/MCMC/fullcond.pdf
	stat250_hw1/MCMC/mcmc.R
	stat250_hw1/MCMC/mcmc.c
	stat250_hw1/MCMC/run.R
	stat250_hw1/MCMC/template.R
	stat250_hw1/README.txt
	stat250_hw1/RESULTS1.rda
	stat250_hw1/RITA/rita.R
	stat250_hw1/cpuinfo.txt
	stat250_hw1/ecut/GNUmakefile
	stat250_hw1/ecut/README
	stat250_hw1/ecut/Todo
	stat250_hw1/ecut/ecut.c
	stat250_hw1/ecut/eg.csv
	stat250_hw1/memoryinfo.txt
	stat250_hw1/method2.r
	stat250_hw1/method6.r
	stat250_hw1/setup_database.sh
Merge branch 'master' of ../stat250_a1