update before pull
Merge branch 'master' of github.com:Netzfreiheit/savetheinternet

Conflicts:
	index.html
Merge branch 'master' of github.com:Netzfreiheit/savetheinternet