added config.rb settings to guardfile and removed config.rb and cleaned
up sass file
merge conflict