Merge pull request #2 from amatus/to-upstream

Redo crazy snaking +3V3 trace.
made larger battery hole and straightened some traces