Hiding scrollys
merging
Cleaning whitespace
Merge branch 'master' of github.com:TheEwok/dotfiles