Fixed #148 password field
Attached generator to button #146

As soon as the function works, close the issue
Merge pull request #156 from firethanatos/master

Fixed #146
Fixed #152, shark now appears properly
Merge branch 'master' of github.com:Donnervoegel/java