Added server configuration
Merge branch 'master' of https://github.com/amiq11/cloud2014-A2