committed files from master to branch

I considered not committing these files since, as discussed, they aren't
100% correct. But since we're already used to them I've decided to
include them anyway.