login screen didn't reference the other activities properly. huehuehue
booty
Merge remote-tracking branch 'origin/master'