Add new files and stuff.
Add proper bash profile
Resolve merge conflicts.