merging dev for now + deleting todo.txt from master
Merge branch 'dev'
Merge branch 'dev'
add data retrieval