Stuff
Merge branch 'master' of github.com:bryanmikaelian/dotfiles

Conflicts:
	tmuxinator/tmuxinator.symlink/picnow.yml
SNew stuff