Initial
Modified git, mairix, and bashrc
merge