Rspecs
Merge conflict fixes
JS fixes
Merge pull request #24 from NatalieFrecka/integration-tests

Integration tests