reversed new computer logic.. not working
Merge remote-tracking branch 'origin/master'