Updated many things, UI almost complete, just need to finish databases
Merge branch 'master' of https://github.com/ajd394/libzforfriends

Conflicts:
	.DS_Store
	index.html