Merge annoying conflict.
committing gitignore stuff
Merged main activity
One last line