Tasks and Events are now separated. Began onClickListener
Expandable children now have separate TextViewz
Implemented a ListView in a fragment that can display tasks
Merge branch 'listFragment' of https://github.com/simonjrp/ESCAPE into listFragment
Modified .gitignore
Fix for merge fail and commented some code
Shit looks (somewhat) better. Also: Custom launcherIcon
Implemented way for task list to update view if data changed
Comment about how expandableList might update its view once it can be tested for reliability
Date/Time Spinners added along with ottershit
Merge branch 'listFragment' of https://github.com/simonjrp/ESCAPE into listFragment

This merge is neccessary because I am Batman.
Further work on Add
Fixed merge BATMANSTYLE
Added task and event lists as tabs
The events tab is now the first to be shown after starting the app
Tried to sort evnents into event list. Makes app crash
Removed code by commenting it in order to track errors
Event sorting seems to be working
Merge branch 'eventSorting' into dev
DBHandler now returns Id of the inserted row (when adding)