login progress bar
fixed conflicts
Merge pull request #1 from CalvinFernandez/loader

Loader