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).
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
fixed [rpblems with the map
added a popups to the markers
added warning popups
refactor
Fixed some bugs and got rid of all the headers