Dropbox eingebaut
Merge branch 'master' of https://github.com/scheichi/Schoolboard

Conflicts:
	gen/com/example/schoolboard/R.java
ddd