Change-Id: I6b5962a4e0953e824cd73cbf9dd13f1fb7ac13fd
Signed-off-by: NitriKx <nitrikxisback@gmail.com>
Merge branch 'master' of https://github.com/NitriKx/PTUT-EdT.git

Conflicts:
	res/layout/activity_today.xml
Change-Id: Ic6eb10be82acf69736c332fd860afa8c434582f2
Signed-off-by: NitriKx <nitrikxisback@gmail.com>