temp for merge
agauin
Merge branch 'master' of https://github.com/stevekane/slideshow
added styles to slides
adding mixins to SASS, begin working on slide layout