5 commits

Author	SHA1	Message	Date
Daniela Arcese	7577b18876	fixing conflicts	2017-06-04 14:11:23 -04:00
Daniela Arcese	9ccf707476	fixing conflicts	2017-06-04 14:07:42 -04:00
Daniela Arcese	292ff8c27f	upload page ui	2017-06-04 14:04:43 -04:00
Daniela Arcese	a2fb87aab4	add gitignore	2017-06-04 14:02:24 -04:00
Daniela Arcese	cc0ece20de	upload page ui	2017-06-02 15:02:49 -04:00