Merge pull request #1 from tatwater/Tony

Added series of todos.
Merge pull request #2 from tatwater/Tony

Added notes for Teagan
Merge branch 'master' of ssh://git@github.com/tatwater/web-based-ftp.git into Tony