added query getting actual events from DB
added sample secrets.yml file
fixing merge problem
merged changes
merged conflicts