added JS to dismiss the definitions
deleted file for conflict
finished up with js stuff
merged my branch into master to push