tried new upload
Merge branch 'master' of https://github.com/eschilling90/miniproject

Conflicts:
	Miniproject What I have/WebService/webService.pyc
	Miniproject What I have/connexus/connexus.pyc