s
Search implemented
pulling master
merge maseter
Finally fixed login code, no more sessions