bashrc stuff
merge resolution
update gitignore