working cucumber, but gets weird error about flexslider
merge conflicts
Merge branch 'master' of github.com:BrandonWLee/wisdomsun