Merge branch 'master' of https://github.com/s6mike/GAuditR

Conflicts:
	GAuditR.R
Merge branch 'master' of https://github.com/s6mike/GAuditR