Conflicts: elements.less Also switched from tabs to spaces (it's easier to merge that way) and threw all the credits in a separate file.