Merge pull request #34 from meghanlarson/master

Changes to data model and start of feedback function.
MMLC-88: Sample Frisby setup and test.
MMLC-88: Test dependency update.
MMLC-88: Wrap the test in Jasmine functions to make it easier to group scenarios and test cases.
Merge pull request #35 from jbrugge/master

Initial test setup for Frisby and Jasmine
Merge remote-tracking branch 'upstream/master'