commit before pull, must have forgot
commit after fixing merge conflicts

Merge branch 'master' of https://github.com/fawda123/SWMPr

Conflicts:
	R/swmpr_analyze.R
	R/swmpr_organize.R