Added server option
Merge branch 'jdkoola/master' of github.com:cs27x/GroupPic into jdkoola/master