changed to use grunt
edited readme
fixed conflict with origin