erica's changes
Merge branch 'erica'
Merge branch 'master' into erica
Added in logic for logout
Resolving conflicts
Merge branch 'master' into marty
resolving more conflicts
removed header from container class
Merge branch 'master' into marty
Removed some items that made it in from a bad merge
Merge branch 'marty'
Merge branch 'master' into erica
splash addition
Merge branch 'erica'
Merge branch 'master' into erica
Added in logic for photo upload and progress indicators
Fixed conflict
Merge branch 'master' into marty
Merge branch 'master' into erica
splash alpha length