Initial commit
Webservide 1.0
Server 2.0
Merge branch 'master' of github.com:3104-project-team/server

Conflicts:
	README.md
	index.php