pretty formatting
Merge branch 'master' of https://github.com/kerko/sysadm-project

# By h41xy
# Via h41xy
* 'master' of https://github.com/kerko/sysadm-project:
  Fixed Error with variable concatenation in default.pp
  Syncfolderpath changed, htop added to tools

Conflicts:
	puppet/manifests/default.pp