add lightbox changes
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	gamebosztore-html/css/lightbox.less
	gamebosztore-html/css/main.css
	gamebosztore-html/portfolio.html
lightbox changes 2
Merge remote-tracking branch 'origin/master' into develop
no message
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	gamebosztore-html/css/main.css
Merge remote-tracking branch 'origin/master' into develop
Merge remote-tracking branch 'origin/master' into develop
Merge remote-tracking branch 'origin/master' into develop
Merge remote-tracking branch 'origin/master' into develop
Merge remote-tracking branch 'origin/master' into develop
no message
Merge remote-tracking branch 'origin/master' into develop
add styles and JS to the Contact Us Form
Merge branch 'master' of https://github.com/alejandronanez/gamebosztore into develop

Conflicts:
	gamebosztore-html/css/main.css
Merge remote-tracking branch 'origin/master' into develop
no message
Merge branch 'develop'

Conflicts:
	gamebosztore-html/css/main.css