quick update
profile page udpate
Revert "added splash screen"
reverted!
This reverts commit 54018e061e881b1b29f6d5dc525d34a0aa94f26c.
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into doug
added more error checking to not break the profile page