added instructions
instrucitions
workin on it
Merge branch 'master' of https://github.com/EdNeg/DB-Project
testing
Fixed user stuff
Merge branch 'master' of https://github.com/EdNeg/DB-Project

Conflicts:
	index.html
Fixed query