added @author to files I wrote
Merge remote-tracking branch 'origin/master'