Update main.js for testing
Merge branch 'master' of https://github.com/teknophile74/ICS_499_Group2

Conflicts:
	GamePortal_PHP_JS/WebContent/WordExplorer/css/galleryView.css
Update of local files .css and index
Updated css
Merge branch 'master' of https://github.com/teknophile74/ICS_499_Group2
Updated to testGUI.js
Merge branch 'master' of https://github.com/teknophile74/ICS_499_Group2