Merge pull request #1 from linyang625/master

9:41pm
Merge pull request #2 from linyang625/master

Lots of shit changed. Yay hackathon
main activity, splash screen, main screen updates.