working todo list
resolve conflicts in readme and license