add some text to mainactivity
add git ignore file
Merge branch 'develop'