uncommited changes
Merge branch 'master' of https://github.com/eschilling90/miniproject

Conflicts:
	WebService/webService.py