Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	.bash_aliases
	.vimrc