modified to fit aerotech req
fixed directory tree
added Ant, JUnit and GPA
updated education
Merge branch 'aerotech', updated education