Add current status
Merge branch 'master' of github.com:daGrevis/Dotfiles

Conflicts:
	.vimrc