updatebash
resolve conflicts
Merge pull request #6 from QwinixLabs/updatebash

updatebash