Added some functions for reading the database
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/Lifemeter/MyActivity.java
Added some functions for reading the database
Added some functions for reading the database