removed authorship from files
Merge conflicts are fun