4 commits

Author	SHA1	Message	Date
Daniela Arcese	7577b18876	fixing conflicts	2017-06-04 14:11:23 -04:00
Daniela Arcese	a2fb87aab4	add gitignore	2017-06-04 14:02:24 -04:00
Danny Coates	28498af6d5	incremental upload refactor	2017-06-01 21:59:58 -07:00
Daniela Arcese	ced5299a4d	add gitignore	2017-06-01 13:57:35 -04:00