cleared one test
next test clear
tests passing
merge resolved
Merge branch 'master' into testing
Merge pull request #30 from ieatkimchi/testing

Testing
Merge branch 'master' into deployment
fixed merge conflict