Synch between OC PC and main computer.

Signed-off-by: beckerdad <beckermom@gmail.com>
Merged and fixed conflict