Added local bash_profile and ignore node and bower stuff
Merge conflict