Working on DiaryLog and Entry view
Trying to push
Merge branch 'master' of
https://github.com/SEAHood/Team6IndustrialProject.git

Conflicts:
	src/com/jobhound/activities/CustomListAdapter.java