added gettaxi
choosing technology presentation edits
fix merge conflict with choosing technology slides