Update web/css/style.css
Update web/index.php
Update web/css/style.css
This contains Hafiz's pull request.  I moved his files to the top-level directory.  the web/css, web/img, and web/font, and web/js have been moved one level up.

Merge branch 'master' of https://github.com/Hafiz8594/MiyagiWebSite into Hafiz-pullRequest

Conflicts:
	web/css/style.css
	web/index.php
Moved these directories from the web/ folder to the top level folder.
Merge branch 'Hafiz-pullRequest'

This contains the changes that Hafiz incorporated from his Pull Request #8.  I worked his changes in and then moved the files around.  This is part of the manual merge I must do by command-line.