Merge branch 'master' of C:\Android\CS480 with conflicts.
Merge remote-tracking branch 'origin/master'
Database Stuff