Merge branch 'master' into Wallpaper
Wallpaper one

First upload of Wallpaper autosave
Merge pull request #8 from bierlingm/Task+LifeGoal-Activities

Task+life goal activities
Merge branch 'master' into Wallpaper

Conflicts:
	app/src/main/java/com/example/xonfire/xonfire/LogList.java
	app/src/main/res/layout/activity_log_list.xml
Merge pull request #9 from bierlingm/Wallpaper

Added Wallpaper when click on fire
Merge pull request #10 from bierlingm/Task+LifeGoal-Activities

Task+life goal activities
Resolved drawable issues

- Changed out drawables called as backgrounds
Merge pull request #11 from bierlingm/Task+LifeGoal-Activities

Task+life goal activities
Small layout and spelling changes
Merge branch 'Task+LifeGoal-Activities'

Putting all the functionalities and layout changes together; hoping for
Kien to pull off the save function for the log_task_buttons
Clicked task buttons added to drawables
Merging master intro kien-task-persist