3 commits

Author	SHA1	Message	Date
Dylan Leonard	db4d203437	Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts." ... This reverts commit 4bda222786.	2017-09-16 20:02:08 -04:00
Dylan Leonard	4bda222786	Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts.	2017-09-16 19:27:10 -04:00
Milos Kozak	9b749202fd	Objectives design	2016-06-04 17:28:05 +02:00