pulling stuff
added pages
Merge branch 'master' of https://github.com/alin72/CSE-308

Conflicts:
	nbproject/private/private.properties
	src/Admin/admin.html
	src/Admin/statistics.html
Added user page