Add files from frankfurt.
Merge in .bash_profile from other machines.
Commit merge between frankfurt and other machines' .bashrc files.
Merge together frankfurt and files from other machines.