added some functions
merging files Merge remote-tracking branch 'origin/master'