Merge pull request #3 from zeryl/master

Extracted passwords to settings file, and added gitignore
remove merge articacts
Merge pull request #5 from chrwei/master

remove merge articacts
Hopefully fixed