added search page
Merge branch 'master' of https://github.com/mylesmclevedge/NoteShare
GUI demo version
added models
Merge branch 'master' of https://github.com/mylesmclevedge/NoteShare

Conflicts:
	templates/settings.html