cleaned up Android stuff. Added ToDo list