scopa test
1. commit master Julian
undo scopa
Merge branch 'master' of https://github.com/Blackimp/FinalProject

Conflicts:
	js/functions.js
fix
get covers into table
Merge branch 'master' into kevin

Conflicts:
	css/style.css
	index.html