Update .gitignore
Update .gitignore
Merge pull request #1 from ak88/master

Merge
login test
final
Merge pull request #2 from ak88/master

Merge
Merge pull request #1 from bancer/master

new features