changed copy
Merge branch 'lolwut'