adding more images
happy hour icon
cap hill slider
cap hilkl slider part 2
cap hill slider 4
cap hill banner move
trying to make jscript banner switch work
moving cap hill slider images into public folder as well
moving slider js files to local
adding new style tags to images on cap hill slider
trying to get both google maps to work
changed all http to https in caphill.erb
going back to http instead of https on caphill.erb
Merge pull request #13 from ChasevanHekken/Chase

Chase
Merge branch 'master' of https://github.com/ChasevanHekken/clone_wars into fix_erbs_to_use_layout

Conflicts:
	lib/views/caphill.erb
	lib/views/locations.erb