Added CPU info function and fixed error with printf
Added user info
Merge branch 'testing'

Conflicts:
	sysinfo.sh

Merge
Fixed