Updated .gitignore to ignore lint.xml and project.properties
Fixed lint.xml and project.properties issue
resolving conflict
Merge branch 'madhatter--' of http://github.com/g3-ks/Multishare into madhatter--
reverted .gitignore
Merge pull request #13 from g3-ks/madhatter--

Fixed project.properties, lint.xml