added trademark to header
updating year on software license
fixed conflict
Merge pull request #1 from dryan/dryanllc

updates for dryan LLC