i said something
fixing merge issue
adding stuff
fixed merge issue
i added text
Fixed .gitignore. Fixed build.gradle. Removed app.iml.
Merge pull request #2 from elyselturner/master

i said something