Image Gallery plugin
Merge branch 'master' of https://github.com/olsonkr/CableOne-Dev

Conflicts:
	app/css/custom.css
Added custom css back in