About to be discarded
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/vromia/e_nurseproject/Activities/DietActivity.java
Fixing hour in DietActivity
Merge remote-tracking branch 'origin/master'