Fixed graph issue
Changed time to 12-format
Added screensaver config + zsh 'lock' alias
Merge branch 'master' into notebook

Conflicts:
	.zsh_aliases