Almost finished with Daily class, need to figure out good way to display time
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/liz/digipa/Daily.java
more daily