images broken still
images broken still2
images working
Merge branch 'master' of github.com:ericleo/Event-Finder into erb

Conflicts:
	app/actions.rb
Merge branch 'master' of github.com:ericleo/Event-Finder

Conflicts:
	app/actions.rb
erge branch 'erb'

Conflicts:
	app/actions.rb

:x