added members page
solved conflict in congif.php
solved conflict in congif.php
solved conflict in congif.php
solved conflict in congif.php
Merge branch 'master' of https://github.com/lftechnologyinc/hack_codejammers