Merge branch 'master' of github.com:ese-unibe-ch/ese2013-team3

Conflicts:
	.gitignore
test
test