update om merge conflict weg te krijgen
Merge branch 'master' of https://github.com/po3-cwa3/po3-quantified-bike-web

Conflicts:
	detail_page/.DS_Store
	detail_page/.idea/workspace.xml