pushing new branch
changed to gituation
Merge branch 'master' into MainUI
"merging in the master for function call to mainWindow updateInfoWindow"
Merge branch 'master' into MainUI
"Anthony fixed reference to MainWindow"
initInfoWindow function added with the setPlaceholderText option. will be called from canvas on launch.
Merge branch 'MainUI'
Merge branch 'master' into mauraUI