running grunt
final changes ;)
Merge branch 'testing'
changing the defult file