added test phalanx team; in progress
working stupid phalanx
fortify; in progress
Merge remote-tracking branch 'origin/master'