Update TODO.txt
Update TODO.txt
Update TODO.txt
Update TODO.txt
Update TODO.txt
Merge branch 'master' of https://github.com/gorlanwix/send-files-tpa

Merging to get updates
Merging repository to my directory
Merge remote-tracking branch 'upstream/master'
Add a new factory (not working yet) to simplify code in settings controller. Add new page for post-login to run scripts to change settings view
Trying to fix merge errors
Trying to fix merge conflicts
Merge pull request #57 from gorlanwix/gorlanwix-Feature-LoginVerification

Gorlanwix feature login verification
Cleaned up widget so everyone can use it while I work on new html elements
Merge pull request #58 from jeffreywix/Fix-Cleaning

Cleaned up widget so everyone can use it while I work on new html elemen...
Merge pull request #59 from andreywix/Feature-PolishingUp

Feature - Polishing up
fixes capacity