3 commits

Author	SHA1	Message	Date
David Baldwynn	6a9b8ee8a8	fixed merge conflicts in app/models and app/tests	2015-10-06 13:24:02 -07:00
David Baldwynn	2638af607f	fixed submissions fields	2015-10-06 13:14:12 -07:00
David Baldwynn	4c0080659f	started oscarhost API update	2015-09-10 15:06:28 -07:00