Merge branch 'master' of https://github.com/walker808/CapitalOne_JuniorPay

Conflicts:

capitalone.juniorpay/bin/classes/com/example/capitalone/juniorpay/LoginA
ctivity.class

capitalone.juniorpay/bin/classes/com/example/capitalone/juniorpay/R$layo
ut.class

capitalone.juniorpay/bin/classes/com/example/capitalone/juniorpay/R$menu
.class

capitalone.juniorpay/bin/classes/com/example/capitalone/juniorpay/R$stri
ng.class

capitalone.juniorpay/bin/classes/com/example/capitalone/juniorpay/R$styl
e.class