functions
added functions
Merge remote-tracking branch 'origin/master'
formatted
Merge remote-tracking branch 'origin/master'