Indendation

Fixed the indentation.
Merge branch 'poweranalysis' of https://github.com/tpobst/GHThesis
rollback?
Merge branch 'poweranalysis' of https://github.com/tpobst/GHThesis into poweranalysis
replaced chapters 2,4 with outlines from master
replaced chp 2,3 with outlines from master
little adds
Finished chp.3 intro
into instruments
good enough for google
intro done
rough draft complete
Merge remote-tracking branch 'origin/master' into TrendAnalysis

Conflicts:
	LaTexThesis/TimPobst-thesis.tex
Merge remote-tracking branch 'origin/bonferroni' into TrendAnalysis

Conflicts:
	LaTexThesis/TimPobst-thesis.aux
	LaTexThesis/TimPobst-thesis.brf
	LaTexThesis/TimPobst-thesis.lof
	LaTexThesis/TimPobst-thesis.log
	LaTexThesis/TimPobst-thesis.lot
	LaTexThesis/TimPobst-thesis.out
	LaTexThesis/TimPobst-thesis.pdf
	LaTexThesis/TimPobst-thesis.synctex.gz
	LaTexThesis/TimPobst-thesis.toc
	LaTexThesis/back-matter/appendix-1.aux
	LaTexThesis/back-matter/vita.aux
	LaTexThesis/chapters/chapter-2.aux
	LaTexThesis/chapters/chapter-2.tex
	LaTexThesis/chapters/chapter-3.aux
	LaTexThesis/chapters/chapter-3.tex
	LaTexThesis/chapters/chapter-4.aux
	LaTexThesis/chapters/chapter-4.tex
Merge remote-tracking branch 'origin/poweranalysis' into TrendAnalysis

Conflicts:
	LaTexThesis/Thumbs.db
	LaTexThesis/TimPobst-thesis.aux
	LaTexThesis/TimPobst-thesis.bbl
	LaTexThesis/TimPobst-thesis.blg
	LaTexThesis/TimPobst-thesis.brf
	LaTexThesis/TimPobst-thesis.lof
	LaTexThesis/TimPobst-thesis.log
	LaTexThesis/TimPobst-thesis.lot
	LaTexThesis/TimPobst-thesis.out
	LaTexThesis/TimPobst-thesis.pdf
	LaTexThesis/TimPobst-thesis.synctex.gz
	LaTexThesis/TimPobst-thesis.toc
	LaTexThesis/back-matter/appendix-1.aux
	LaTexThesis/back-matter/vita.aux
	LaTexThesis/chapters/chapter-2.aux
	LaTexThesis/chapters/chapter-2.tex
	LaTexThesis/chapters/chapter-3.aux
	LaTexThesis/chapters/chapter-3.tex
	LaTexThesis/chapters/chapter-4.aux
	LaTexThesis/chapters/chapter-4.tex
merge trend into master
fix merge