more work on programmers
Merge remote-tracking branch 'origin/master'
finishing up programmer data class
started programmer/action interaction
Merge remote-tracking branch 'origin/master'
fixing merge issues