Adding settings and uploading code for safe keeping - do not load on
site
Adding to project
Pushing new html
Update to HTML code
Merge branch 'master' of
https://github.com/teknophile74/ICS_499_Group2.git

Conflicts:
	GamePortal_PHP_JS/WebContent/AlphaArranger/lang/IN/te/LangJSON.js