Removed development.log
Fixed merge
Added searching and sorting