different mod key to avoid confusion
Merge branch 'master' into VM
unneeded temp on vm
merged
added vboxclient for vm
Merge branch 'master' of https://github.com/scoiatael/config into VM
Merge branch 'master' of https://github.com/scoiatael/config into VM

Conflicts:
	xmonad/startup.sh
merge (reqs better solution later)
Merge branch 'master' of https://github.com/scoiatael/config
Merge branch 'master' of https://github.com/scoiatael/config into VM

Conflicts:
	xmonad/startup.sh
Merge branch 'master' of https://github.com/scoiatael/config into VM
redone conky
Merge branch 'master' of https://github.com/scoiatael/config
Merge branch 'VM' of https://github.com/scoiatael/config
better stats'
'
Merge branch 'VM' of https://github.com/scoiatael/config
merge