Merge pull request #1 from tverbeiren/master

Updated voor omzetten naar PDF
step 2
trying to resolve conflict

Merge branch 'master' of https://github.com/hugokoopmans/dataMineR

Conflicts:
	.RData
	2-data-preperation/data-preperation-report.html
	2-data-preperation/data-preperation-report.md
merging my stuff into master
fixing meshed up merge now data analysis should be ok again, need pander stuff in catagoricals
data added
put this back in
using simple example data again
additional changes back where we were, i hope
recode setup
test code for recoding added
trying to bring in pull request

Merge branch 'master' of git://github.com/tverbeiren/dataMineR into tverbeiren-master

Conflicts:
	1-data-understanding/da-categorical.Rmd
	1-data-understanding/data-analysis-report.Rmd
	1-data-understanding/data-analysis.R
	data/data-analysis.tab
tested pull request and made changes now ready for merge
rename to capitals so make understands flename
working on recode stuff
Merge with upstream and corrections

modified:   ../.gitignore
Cleanup and simplification

modified:   Data-Analysis-Report.Rmd
Updated date to reflect updates in general

modified:   data-analysis.R
Commented out explicit path references to avoid conflicts

deleted:    ../data/data-analysis.tab
This file is generated during the analysis process, not to be included

new file:   ../data/data-simple-example.tab
This file was not present in my branch