lightbox
lightbox fix
Merge branch 'master' of https://github.com/sharonrh/VifthFloor

Conflicts:
	CI/application/views/game.html
	CI/application/views/showcase.html