added slideshow components
fixed merge issues
added slideshow functionality
misc small hack attemts on email forms
Merge pull request #19 from cenderin/master

Added contact page, about page, fixed routes to work correctly.
I dont know
fixed mege conflicts
testing assets
fixed event controller testing
Merge pull request #20 from earthspiritart/master

added a slide show and redo on templates for email and newsletter
updated git ignore
Merge remote-tracking branch 'upstream/master'
removed email template, too much for now