Completed SplashScreen. And checked User logic

I would still think it'd be a good idea for someone else to double my
double check of User logic (just to be safe).
Fixed some merge errors
Pick Character works
Tried to fix PuzzleActivity but got tired :P
merging
fixes memory leaks and photo album crashes, fixes inventory view, also resolves merge conflicts, but map view still doesn't work on my end, but don't worry I didn't touch the files so hopefully it will work for you
layout changes
adding missing file
updating gitIgnore
git ignore
git ignore
Merge branch 'jennwu-master1'
dding more stuff to gitignore
merging Jens changes
Merge branch 'jennwu-master-1'
adding ignoring settings
merging Carolyns changes
merging carolines changes
a
minor bug fixes; more to go
fixed issues with centering of the map and some of the double locating/rendering issues; more to come