Merge remote-tracking branch 'origin/master' into develop
Merge remote-tracking branch 'origin/master' into develop
Merge remote-tracking branch 'origin/master' into develop
Add class in main.css for an article in the About Us Page
Merge remote-tracking branch 'origin/master' into develop
no message
no message
Merge branch 'develop'

Conflicts:
	gamebosztore-html/css/main-backup.css
	gamebosztore-html/css/style-responsive.css