merge changes
database conflict
Jasmine testing framework
Have not written any tests though
merge conflicts