got my mojo working
say hello to user
Merge branch 'master' of github.com:/nervousmerc/cis

Conflicts:
	cis.pl
Merge branch 'hello'