Merge branches 'master' and 'marinabranch'
Have Delite Running
Commiting changes to welcome screen
Commiting udpates to javascript and welcome screen
Merge branch 'marinabranch'
Committing changes to merge
Commiting branches for merge
Merge branch 'master' into marinabranch
Merge pull request #2 from marinaelmore/marinabranch

Merging marinabranch and master. I added a new welcome screen as well as modified the javascript pluggins to load and manage the separate graphs