merge error
Merge https://github.com/eriyaterada/pass_generator
commit colon fixed
merge1
javascript, master password window
commit for fixing conflict