javascript in separate file
Merge branch 'master' of github.com:fhinkel/starwars
Merge branch 'master' of github.com:fhinkel/starwars

Conflicts:
	public/index.html
keine index.js mehr