4 commits

Author	SHA1	Message	Date
IvanaE	296aaf05e3	fixed merge conflict, when you pull check the right dependency is in your build.gradle file	2018-10-10 13:44:55 -04:00
IvanaE	0b36bb32e3	added appointment class and finished ui	2018-10-05 12:35:05 -04:00
Batuhan Berk Başoğlu	ac7e8aec0a	fixed some file inconsistencies	2018-10-05 11:39:30 -04:00
IvanaE	5663255788	Added android project	2018-09-28 15:39:43 -04:00