Add todo list
minor updates
Merge
Merging from pug
Merged shell_aliases