Fixed path in annulus_create
Perparing for merge
Merge remote-tracking branch 'upstream/master'
Fixed minor issues in pfss_shock and added process_file_search
Fixed conflicts and merged time change to pfss_shock_run_csgs
Fixed issue in pfss_shock_run_csgs
Updated pfss_shock and improved process_file
Added pfss stats to process_file_search
Finished process_file_search
Fixed a problem in sync_event_webfolders and added update_webpage
Added exclusion to update_webpage and coronal_shocks_page
Exclude events feature implemented into web scripts
Updated web files
Updated events.json file with an event from Nitta 2013 on 110308
Updated events.json
Updated process_file_search with condensed output and /all option
Added event and fixed bug in process_file
Fixed conflicts and merged with upstream
Fixed events.json
Merge remote-tracking branch 'upstream/master'