ids
Merge branch 'ids'

Conflicts:
	index.html
conflict cleanup
Merge branch 'master' of github.com:arthurra/daap_works

Conflicts:
	index.html