added mixing and edited gruntfile