commit
gallery
work on gallery
change css
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/view.php