Questions update and Server corrections
Merge branch 'master' of github.com:Babouchot/Conquistador