first commit
Merge branch 'master' of https://github.com/AnneSophieRowr/jukebox

Conflicts:
	.gitignore