edit Guardfile
merge develop