first commit after reinstall
changes before actual commit after reinstall
Merge github.com:dkeg/bloat

Conflicts:
	.bash_aliases
	.xinitrc
	gmail.py
	i3config