python auto flake8 on write
Merge branch 'master' of github.com:wanderer/.dot-files
Merge branch 'master' of github.com:wanderer/.dot-files
Merge branch 'master' of github.com:wanderer/.dot-files
add bashrc
Merge branch 'master' of github.com:wanderer/.dot-files

Conflicts:
	.bashrc
Merge branch 'master' of github.com:wanderer/.dot-files
Merge branch 'master' of github.com:wanderer/.dot-files

Conflicts:
	.vim/bundle/vundle
Merge branch 'master' of github.com:wanderer/.dot-files
Merge branch 'master' of github.com:wanderer/.dot-files

Conflicts:
	.vim/bundle/vundle
Merge branch 'master' of github.com:wanderer/.dot-files
Merge branch 'master' of github.com:wanderer/.dot-files

Conflicts:
	.vim/bundle/vim-less
Merge branch 'master' of github.com:wanderer/.dot-files
profile
Merge branch 'master' of github.com:wanderer/.dot-files

Conflicts:
	.profile
Merge branch 'master' of github.com:wanderer/.dot-files

Conflicts:
	.vim/bundle/vundle
Merge branch 'master' of github.com:wanderer/.dot-files
Merge branch 'master' of github.com:wanderer/.dot-files
idk
added tab stylig to vim