Merge pull request #3 from stefanmendoza/Stefan

Added new image assets
Testing Github
Merge pull request #4 from stefanmendoza/Alex

Testing Github
Testing being behind
test
test
test
test
Merge remote-tracking branch 'origin/master' into Stefan
Test
Test conflict
test conflict
Merge remote-tracking branch 'origin/master' into Stefan
test
Done testing conflict management. No idea what will happen.
did work.
Merge pull request #5 from stefanmendoza/Alex

Customized Login Screen