PAJ Client Side addition
Client update
Merge branch 'master' of https://github.com/FEC-UIUC/FEC-Simulator