Finished Usecases. Now doing (Non-) Fuctional requirements
Merge branch 'master' of github.com:ese-unibe-ch/ese2013-team4

Conflicts:
	SRS.docx
resolved .docx merge conflict manually