testing splash
Resolved Conflicts
Edited Splash to make heart beat. Text still needs to be made static