David Baldwynn 6a9b8ee8a8 fixed merge conflicts in app/models and app/tests

2015-10-06 13:24:02 -07:00

..

controllers

fixed login/signup bug

2015-09-15 15:21:49 -07:00

models

fixed merge conflicts in app/models and app/tests

2015-10-06 13:24:02 -07:00

routes

added backend tests

2015-08-07 14:02:44 -07:00

tests

fixed merge conflicts in app/models and app/tests

2015-10-06 13:24:02 -07:00

views

added backend tests

2015-08-07 14:02:44 -07:00