Searches saving and JSON data rendering
Fixed merge conflicts and got two searches working
Added angular and some angular functions in js file