added .gitignore
Merge branch 'master' of github.com:androiders/workspace
added stuff to gitignore