fixing merge error
fixed retarded crash on start
Merge remote-tracking branch 'origin/master'
more work on programmers
Merge remote-tracking branch 'origin/master'
programmer view tweaks
added programmer detail view
Merge remote-tracking branch 'origin/master'
added data class for programmer
Merge remote-tracking branch 'origin/master'
merging