4 commits

Author	SHA1	Message	Date
IvanaE	13de8619d9	fixed merge conflict, when you pull check the right dependency is in your build.gradle file	2018-10-10 13:44:55 -04:00
Batuhan Berk Başoğlu	a8972e06c5	fixed some file inconsistencies	2018-10-05 11:39:30 -04:00
IvanaE	5a97ad2ec8	added sign up page, still working on drop down menu	2018-09-28 18:09:05 -04:00
IvanaE	5663255788	Added android project	2018-09-28 15:39:43 -04:00