several
photos
Sorting
query fix
Merge branch 'master' of https://github.com/EdNeg/DB-Project

Conflicts:
	index.html
Merge branch 'master' of https://github.com/EdNeg/DB-Project

Conflicts:
	appjs/accountApp.js
Fixed image display