included modal dialog plugin, consolidated js files to new file
wth merge why u no play well