resolved merge conflict
reordered
Merge branch 'master' of https://github.com/DDAZZA/dotfiles

Conflicts:
	vimrc
auto align pry after insert