gulp
fixed merge conflicts
gulped
fixed merge conflicts
updated readme